Diffstat (limited to 'noncore/net/mailit/emailhandler.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/net/mailit/emailhandler.cpp | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/noncore/net/mailit/emailhandler.cpp b/noncore/net/mailit/emailhandler.cpp index 5b8bda1..06e978d 100644 --- a/noncore/net/mailit/emailhandler.cpp +++ b/noncore/net/mailit/emailhandler.cpp | |||
@@ -73,4 +73,6 @@ void EmailHandler::sendMail(QList<Email> *mailList) | |||
73 | QString temp; | 73 | QString temp; |
74 | QString userName = mailAccount.name; | 74 | QString userName = QString::null; |
75 | userName += " <" + mailAccount.emailAddress + ">"; | 75 | // not supported by ALL SMTP servers in the MAIL From field |
76 | // userName = "\""+mailAccount.name+"\""; | ||
77 | userName += "<" + mailAccount.emailAddress + ">"; | ||
76 | 78 | ||
@@ -444,6 +446,9 @@ int EmailHandler::encodeMime(Email *mail) | |||
444 | Enclosure *ePtr; | 446 | Enclosure *ePtr; |
447 | QString userName; | ||
445 | 448 | ||
446 | QString userName = mailAccount.name; | 449 | if ( ! mailAccount.name.isEmpty() ) { |
447 | if (userName.length()>0) //only embrace it if there is a user name | 450 | userName = "\"" + mailAccount.name + "\" <" + mailAccount.emailAddress + ">"; |
448 | userName += " <" + mailAccount.emailAddress + ">"; | 451 | } else { |
452 | userName = "<" + mailAccount.emailAddress + ">"; | ||
453 | } | ||
449 | 454 | ||