diff --git a/ActiveSync/NSString+ActiveSync.m b/ActiveSync/NSString+ActiveSync.m
index 1e5954b28..047a5d45a 100644
--- a/ActiveSync/NSString+ActiveSync.m
+++ b/ActiveSync/NSString+ActiveSync.m
@@ -66,9 +66,9 @@ static NSArray *easCommandParameters = nil;
 {
   NSString *s;
 
-  s = [self stringByEscapingHTMLString];
+  s = [self safeString];
 
-  return [s safeString];
+  return [s stringByEscapingHTMLString];
 }
 
 - (int) activeSyncFolderType
diff --git a/NEWS b/NEWS
index 85102bcd9..170f54b46 100644
--- a/NEWS
+++ b/NEWS
@@ -16,6 +16,7 @@ Bug fixes
  - fixed automatic return receipts crash when not in the recepient list (#2965)
  - fixed support for Sieve folder encoding parameter (#2622)
  - fixed rename of subscribed addressbooks
+ - sanitize strings before escaping them when using EAS
 
 2.2.9a (2014-09-29)
 -------------------