diff --git a/NEWS b/NEWS
index c535e992a..5eb1e8fd1 100644
--- a/NEWS
+++ b/NEWS
@@ -11,6 +11,7 @@ Bug fixes
  - fixed Chinese charset handling (#2809)
  - fixed folder name (calendars and contacts) of new subscriptions (#2801)
  - fixed the reply/forward operation over ActiveSync (#2805)
+ - fixed regression when attaching files to a reply
 
 2.2.5 (2014-06-05)
 ------------------
diff --git a/UI/MailerUI/UIxMailEditor.m b/UI/MailerUI/UIxMailEditor.m
index 28de05922..f78843b53 100644
--- a/UI/MailerUI/UIxMailEditor.m
+++ b/UI/MailerUI/UIxMailEditor.m
@@ -644,8 +644,9 @@ static NSArray *infoKeys = nil;
   if (!attachmentAttrs || ![co imap4URL])
   {
       [co fetchInfo];
-      if (![co inReplyTo] && [co IMAP4ID] > -1)
+      if ((![co inReplyTo] || currentAttachment) && [co IMAP4ID] > -1)
         {
+          // When currentAttachment is defined, it means we just attached a new file to the mail
           mail = [[[SOGoMailObject alloc] initWithImap4URL: [co imap4URL] inContainer: [co container]] autorelease];
           a = [mail fetchFileAttachmentKeys];
           ASSIGN (attachmentAttrs, a);