diff --git a/app/models/mail_handler.rb b/app/models/mail_handler.rb
index 217321b..ef83c64 100644
--- a/app/models/mail_handler.rb
+++ b/app/models/mail_handler.rb
@@ -193,8 +193,8 @@ class MailHandler < ActionMailer::Base
                             :content => cleaned_up_text_body)
 	message.author = user
 	message.board = board
-	message.save!
 	add_attachments(message)
+	message.save!
     logger.info "MailHandler: message ##{message.id} created by #{user}" if logger
 	message
   end
diff --git a/app/models/message.rb b/app/models/message.rb
index 4335fef..d208961 100644
--- a/app/models/message.rb
+++ b/app/models/message.rb
@@ -45,7 +45,7 @@ class Message < ActiveRecord::Base
   after_create :add_author_as_watcher, :reset_counters!
   after_update :update_messages_board
   after_destroy :reset_counters!
-  after_create :send_notification
+  after_commit :send_notification, :on => :create
 
   scope :visible, lambda {|*args|
     includes(:board => :project).where(Project.allowed_to_condition(args.shift || User.current, :view_messages, *args))