diff --git a/ActiveSync/NSData+ActiveSync.m b/ActiveSync/NSData+ActiveSync.m
index dd925c715..cf059e66f 100644
--- a/ActiveSync/NSData+ActiveSync.m
+++ b/ActiveSync/NSData+ActiveSync.m
@@ -66,7 +66,33 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 // 
 - (NSString *) activeSyncRepresentationInContext: (WOContext *) context
 {
-  return [[self stringByEncodingBase64] stringByReplacingString: @"\n" withString: @""];
+  NSString *tmp, *s;
+  unichar *buf, *start, c;
+  int len, i, j;
+
+  tmp = [self stringByEncodingBase64] ;
+
+  len = [tmp length];
+
+  start = buf = (unichar *)malloc(len*sizeof(unichar));
+  [tmp getCharacters: buf range: NSMakeRange(0, len)];
+
+  for (i = 0, j = 0; i < len; i++)
+    {
+      c = *buf;
+
+      if (!(c == 0xA))
+        {
+          *(start+j) = c;
+          j++;
+        }
+
+      buf++;
+    }
+
+  s = [[NSString alloc] initWithCharactersNoCopy: start  length: j  freeWhenDone: YES];
+
+  return AUTORELEASE(s);
 }
 
 - (NSData *) wbxml2xml
diff --git a/NEWS b/NEWS
index ec8cf7a00..62ded5385 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+2.3.1 (2015-06-XX)
+------------------
+
+Enhancements
+ - improved EAS speed, especially when fetching big attachments
+
 2.3.0 (2015-06-01)
 -------------------