From fbf5c4f6c2dcad6fa8afb24e0faa7f1704d074fb Mon Sep 17 00:00:00 2001
From: Ludovic Marcotte <lmarcotte@inverse.ca>
Date: Wed, 13 May 2015 19:09:58 -0400
Subject: [PATCH] (fix) always include SrcMsgId in the MoveItems's response

---
 ActiveSync/SOGoActiveSyncDispatcher.m | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ActiveSync/SOGoActiveSyncDispatcher.m b/ActiveSync/SOGoActiveSyncDispatcher.m
index 5bbc394c9..65d76a390 100644
--- a/ActiveSync/SOGoActiveSyncDispatcher.m
+++ b/ActiveSync/SOGoActiveSyncDispatcher.m
@@ -1621,10 +1621,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
               //
               // See http://msdn.microsoft.com/en-us/library/gg651088(v=exchg.80).aspx for Status response codes.
               //
+              [s appendFormat: @"<SrcMsgId>%@</SrcMsgId>", srcMessageId];
               if ([prevSuccessfulMoveItemsOps objectForKey: srcMessageId])
                 {
                   // Previous move failed operation but we can recover the dstMessageId from previous request
-                  [s appendFormat: @"<SrcMsgId>%@</SrcMsgId>", srcMessageId];
                   [s appendFormat: @"<DstMsgId>%@</DstMsgId>", [prevSuccessfulMoveItemsOps objectForKey: srcMessageId]];
                   [s appendFormat: @"<Status>%d</Status>", 3];
                   [newSuccessfulMoveItemsOps setObject: [prevSuccessfulMoveItemsOps objectForKey: srcMessageId]  forKey: srcMessageId];