diff --git a/lib/gitlab/email/handler/base_handler.rb b/lib/gitlab/email/handler/base_handler.rb
index 4d74e770b918fd96f81d9f82c6c7d2558aab3cd0..1691fca6465b91d1325637979220e21a5df9375f 100644
--- a/lib/gitlab/email/handler/base_handler.rb
+++ b/lib/gitlab/email/handler/base_handler.rb
@@ -31,7 +31,8 @@ module Gitlab
         end
 
         def process_message
-          add_attachments(ReplyParser.new(mail).execute.strip)
+          message = ReplyParser.new(mail).execute.strip
+          add_attachments(message)
         end
 
         def add_attachments(reply)