From aaa0de4dbccde7fe26ebb13719a4958a9c636172 Mon Sep 17 00:00:00 2001
From: cketti <cketti@gmail.com>
Date: Fri, 6 Sep 2013 20:28:46 +0200
Subject: [PATCH] Don't append "null" to the "MAIL FROM" line in case the
 server doesn't support 8BITMIME

---
 src/com/fsck/k9/mail/transport/SmtpTransport.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/fsck/k9/mail/transport/SmtpTransport.java b/src/com/fsck/k9/mail/transport/SmtpTransport.java
index a958c42d6..30ad91b4d 100644
--- a/src/com/fsck/k9/mail/transport/SmtpTransport.java
+++ b/src/com/fsck/k9/mail/transport/SmtpTransport.java
@@ -493,7 +493,7 @@ public class SmtpTransport extends Transport {
         Address[] from = message.getFrom();
         try {
             executeSimpleCommand("MAIL FROM:" + "<" + from[0].getAddress() + ">"
-                    + (m8bitEncodingAllowed ? " BODY=8BITMIME" : null));
+                    + (m8bitEncodingAllowed ? " BODY=8BITMIME" : ""));
             for (String address : addresses) {
                 executeSimpleCommand("RCPT TO:" + "<" + address + ">");
             }