diff --git a/mailqueue/models.py b/mailqueue/models.py
index <HASH>..<HASH> 100644
--- a/mailqueue/models.py
+++ b/mailqueue/models.py
@@ -68,7 +68,8 @@ class MailerMessage(models.Model):
         if self.pk is None:
             self._save_without_sending()
 
-        Attachment.objects.create(email=self, file_attachment=attachment, original_filename=attachment.file.name)
+        Attachment.objects.create(email=self, file_attachment=attachment,
+                                  original_filename=attachment.file.name.split('/')[-1])
 
     def _save_without_sending(self, *args, **kwargs):
         """
original_filename should also be split from its path