From 26e84aad4ba6aab36d590c0b51211c5ef8c7bd78 Mon Sep 17 00:00:00 2001
From: Ludovic Marcotte <lmarcotte@inverse.ca>
Date: Thu, 29 Nov 2018 14:05:12 -0500
Subject: [PATCH] (fix) strip '<>' from bodyId and when forwarding mails

---
 ActiveSync/SOGoMailObject+ActiveSync.m | 2 +-
 NEWS                                   | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ActiveSync/SOGoMailObject+ActiveSync.m b/ActiveSync/SOGoMailObject+ActiveSync.m
index ca75b63e0..9e3205721 100644
--- a/ActiveSync/SOGoMailObject+ActiveSync.m
+++ b/ActiveSync/SOGoMailObject+ActiveSync.m
@@ -1250,7 +1250,7 @@ struct GlobalObjectId {
             {
               if ([[value objectForKey: @"bodyId"] length])
                 {
-                  [s appendFormat: @"<ContentId>%@</ContentId>", [[value objectForKey: @"bodyId"] activeSyncRepresentationInContext: context]];
+                  [s appendFormat: @"<ContentId>%@</ContentId>", [[[value objectForKey: @"bodyId"] stringByTrimmingCharactersInSet: [NSCharacterSet characterSetWithCharactersInString: @"<>"]] activeSyncRepresentationInContext: context]];
                   [s appendFormat: @"<IsInline>%d</IsInline>", 1];
                 }
 
diff --git a/NEWS b/NEWS
index af49f5d37..43cddc3f9 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,11 @@
-4.0.1 (2018-03-XX)
+4.0.5 (2018-MM-DD)
 ------------------
 
+Bug fixes
+ - [eas] strip '<>' from bodyId and when forwarding mails
+
+4.0.1 (2018-07-10)
+------------------
 Bug fixes
  - [web] prevent deletion of special folders using del key
  - [eas] improved alarms syncing with EAS devices (#4351)
@@ -2710,3 +2715,4 @@ Bug Fixes
 Local variables:
 mode: text
 End:
+