diff --git a/src/com/android/email/mail/transport/SmtpSender.java b/src/com/android/email/mail/transport/SmtpSender.java
index b318a59d2..1d7a3d658 100644
--- a/src/com/android/email/mail/transport/SmtpSender.java
+++ b/src/com/android/email/mail/transport/SmtpSender.java
@@ -178,15 +178,15 @@ public class SmtpSender extends Sender {
         Address[] bcc = Address.unpack(message.mBcc);
 
         try {
-            executeSimpleCommand("MAIL FROM: " + "<" + from.getAddress() + ">");
+            executeSimpleCommand("MAIL FROM:" + "<" + from.getAddress() + ">");
             for (Address address : to) {
-                executeSimpleCommand("RCPT TO: " + "<" + address.getAddress().trim() + ">");
+                executeSimpleCommand("RCPT TO:" + "<" + address.getAddress().trim() + ">");
             }
             for (Address address : cc) {
-                executeSimpleCommand("RCPT TO: " + "<" + address.getAddress().trim() + ">");
+                executeSimpleCommand("RCPT TO:" + "<" + address.getAddress().trim() + ">");
             }
             for (Address address : bcc) {
-                executeSimpleCommand("RCPT TO: " + "<" + address.getAddress().trim() + ">");
+                executeSimpleCommand("RCPT TO:" + "<" + address.getAddress().trim() + ">");
             }
             executeSimpleCommand("DATA");
             // TODO byte stuffing
diff --git a/tests/src/com/android/email/mail/transport/SmtpSenderUnitTests.java b/tests/src/com/android/email/mail/transport/SmtpSenderUnitTests.java
index 0f320b6e3..8e9ab750d 100644
--- a/tests/src/com/android/email/mail/transport/SmtpSenderUnitTests.java
+++ b/tests/src/com/android/email/mail/transport/SmtpSenderUnitTests.java
@@ -174,9 +174,9 @@ public class SmtpSenderUnitTests extends AndroidTestCase {
      * Prepare to receive a simple message (see setupSimpleMessage)
      */
     private void expectSimpleMessage(MockTransport mockTransport) {
-        mockTransport.expect("MAIL FROM: <Jones@Registry.Org>",
+        mockTransport.expect("MAIL FROM:<Jones@Registry.Org>",
                 "250 2.1.0 <Jones@Registry.Org> sender ok");
-        mockTransport.expect("RCPT TO: <Smith@Registry.Org>",
+        mockTransport.expect("RCPT TO:<Smith@Registry.Org>",
                 "250 2.1.5 <Smith@Registry.Org> recipient ok");
         mockTransport.expect("DATA", "354 enter mail, end with . on a line by itself");
         mockTransport.expect("Date: .*");