diff --git a/sope-mime/NGMail/NGSmtpClient.m b/sope-mime/NGMail/NGSmtpClient.m
index bb5daba..781ddd3 100644
--- a/sope-mime/NGMail/NGSmtpClient.m
+++ b/sope-mime/NGMail/NGSmtpClient.m
@@ -237,10 +237,10 @@
     buffer = malloc (sizeof (char) * (buflen + 1));
     sprintf (buffer, "%s%c%s%c%s",
              utf8Username, 0, utf8Username, 0, utf8Password);
-    authString = [[NSData dataWithBytesNoCopy: buffer
+    authString = [[[NSData dataWithBytesNoCopy: buffer
                                        length: buflen
                                  freeWhenDone: YES]
-                   stringByEncodingBase64];
+                   stringByEncodingBase64] stringByReplacingOccurrencesOfString:@"\n" withString:@""];
     reply = [self sendCommand: @"AUTH PLAIN"];
     
     if ([reply code] == NGSmtpServerChallenge)
