From 985db9465cde65826eccb144accb168970e849ad Mon Sep 17 00:00:00 2001
From: Ludovic Marcotte <lmarcotte@inverse.ca>
Date: Sun, 17 Jan 2016 06:29:13 -0500
Subject: [PATCH] (fix) avoid generating empty ConversationId which can break
 Android EAS

---
 ActiveSync/SOGoMailObject+ActiveSync.m | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ActiveSync/SOGoMailObject+ActiveSync.m b/ActiveSync/SOGoMailObject+ActiveSync.m
index 434e6b9c9..78391f2b5 100644
--- a/ActiveSync/SOGoMailObject+ActiveSync.m
+++ b/ActiveSync/SOGoMailObject+ActiveSync.m
@@ -1126,9 +1126,9 @@ struct GlobalObjectId {
 
       if ([reference length] > 0)
         [s appendFormat: @"<ConversationId xmlns=\"Email2:\">%@</ConversationId>", [[reference dataUsingEncoding: NSUTF8StringEncoding] activeSyncRepresentationInContext: context]];
-      else if ([self inReplyTo])
+      else if ([[self inReplyTo] length] > 0)
         [s appendFormat: @"<ConversationId xmlns=\"Email2:\">%@</ConversationId>", [[[self inReplyTo] dataUsingEncoding: NSUTF8StringEncoding] activeSyncRepresentationInContext: context]];
-      else if ([self messageId])
+      else if ([[self messageId] length] > 0)
         [s appendFormat: @"<ConversationId xmlns=\"Email2:\">%@</ConversationId>", [[[self messageId] dataUsingEncoding: NSUTF8StringEncoding] activeSyncRepresentationInContext: context]];
     }