diff --git a/app/models/mail_handler.rb.orig b/app/models/mail_handler.rb
index 8421fb6..47d7df0 100644
--- a/app/models/mail_handler.rb.orig
+++ b/app/models/mail_handler.rb
@@ -180,8 +180,8 @@ class MailHandler < ActionMailer::Base

     # add To and Cc as watchers before saving so the watchers can reply to Redmine
     add_watchers(issue)
-    issue.save!
     add_attachments(issue)
+    issue.save!
     logger.info "MailHandler: issue ##{issue.id} created by #{user}" if logger && logger.info
     issue
   end