From 8909775cf653ec3edef69ff02102947acf866e30 Mon Sep 17 00:00:00 2001
From: Ludovic Marcotte <lmarcotte@inverse.ca>
Date: Wed, 9 Apr 2014 12:19:23 -0400
Subject: [PATCH] Fix for #2680

---
 ActiveSync/SOGoActiveSyncDispatcher.m | 12 ++++++++++++
 NEWS                                  |  1 +
 2 files changed, 13 insertions(+)

diff --git a/ActiveSync/SOGoActiveSyncDispatcher.m b/ActiveSync/SOGoActiveSyncDispatcher.m
index d2509bae2..b1b8e4eeb 100644
--- a/ActiveSync/SOGoActiveSyncDispatcher.m
+++ b/ActiveSync/SOGoActiveSyncDispatcher.m
@@ -1437,11 +1437,23 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 {
   NSString *folderId, *itemId, *realCollectionId;
   SOGoMicrosoftActiveSyncFolderType folderType;
+  id value;
 
   folderId = [[(id)[theDocumentElement getElementsByTagName: @"FolderId"] lastObject] textValue];
   itemId = [[(id)[theDocumentElement getElementsByTagName: @"ItemId"] lastObject] textValue];
   realCollectionId = [folderId realCollectionIdWithFolderType: &folderType];
 
+  value = [theDocumentElement getElementsByTagName: @"ReplaceMime"];
+
+  // ReplaceMime isn't specified so we must NOT use the server copy
+  // but rather take the data as-is from the client.
+  if (![value count])
+    {
+      [self processSendMail: theDocumentElement
+                 inResponse: theResponse];
+      return;
+    }
+  
   if (folderType == ActiveSyncMailFolder)
     {
       SOGoMailAccounts *accountsFolder;
diff --git a/NEWS b/NEWS
index 962e44763..71b9e9217 100644
--- a/NEWS
+++ b/NEWS
@@ -13,6 +13,7 @@ Bug fixes
  - fixed birth date validity checks (#1636)
  - fixed URL handling (#2616)
  - improved folder rename operations using ActiveSync (#2700)
+ - fixed SmartReply/Forward when ReplaceMime was omitted (#2680)
 
 2.2.3 (2014-04-03)
 ------------------