patch from wim delvaux.

4 files changed, 22 insertions, 12 deletions

diff --git a/noncore/net/mailit/emailclient.cpp b/noncore/net/mailit/emailclient.cpp
index 749a4e9..90664bb 100644
--- a/noncore/net/mailit/emailclient.cpp
+++ b/noncore/net/mailit/emailclient.cpp
@@ -266,13 +266,13 @@ void EmailClient::enqueMail(const Email &mail)
     qWarning("using account " + currentAccount->name);
   }
   
   Email addMail = mail;
   addMail.from = currentAccount->name;
   addMail.fromMail = currentAccount->emailAddress;
-  addMail.rawMail.prepend("From: " + addMail.from + "<" + addMail.fromMail + ">\n");
+  addMail.rawMail.prepend("From: \"" + addMail.from + "\" <" + addMail.fromMail + ">\n");
   item = new EmailListItem(outboxView, addMail, false);
   
   mailboxView->setCurrentTab(1);
   
 }
 
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
@@ -68,14 +68,16 @@ EmailHandler::EmailHandler()
 }
 
 void EmailHandler::sendMail(QList<Email> *mailList)
 {
   Email *currentMail;
   QString temp;
-  QString userName = mailAccount.name;
-  userName += " <" + mailAccount.emailAddress + ">";
+  QString userName = QString::null;
+  // not supported by ALL SMTP servers in the MAIL From field
+  // userName = "\""+mailAccount.name+"\"";
+  userName += "<" + mailAccount.emailAddress + ">";
   
   for (currentMail = mailList->first(); currentMail != 0;
       currentMail = mailList->next()) {
     
     if (encodeMime(currentMail) == 0) {
       smtpClient->addMail(userName, currentMail->subject,
@@ -439,16 +441,19 @@ int EmailHandler::parse64base(char *src, char *bufOut) {
 
 int EmailHandler::encodeMime(Email *mail) 
 {
   
   QString fileName, fileType, contentType, newBody, boundary;
   Enclosure *ePtr;
+  QString userName;
   
-  QString userName = mailAccount.name;
-  if (userName.length()>0)  //only embrace it if there is a user name
-    userName += " <" + mailAccount.emailAddress + ">";
+  if ( ! mailAccount.name.isEmpty() ) {
+    userName = "\"" + mailAccount.name + "\" <" + mailAccount.emailAddress + ">";
+  } else {
+    userName = "<" + mailAccount.emailAddress + ">";
+  }
   
   //add standard headers
   newBody = "From: " + userName + "\r\nTo: ";
         for (QStringList::Iterator it = mail->recipients.begin(); it != mail->recipients.end(); ++it ) {
     newBody += *it + " ";
   }
diff --git a/noncore/unsupported/mailit/emailclient.cpp b/noncore/unsupported/mailit/emailclient.cpp
index 749a4e9..90664bb 100644
--- a/noncore/unsupported/mailit/emailclient.cpp
+++ b/noncore/unsupported/mailit/emailclient.cpp
@@ -266,13 +266,13 @@ void EmailClient::enqueMail(const Email &mail)
     qWarning("using account " + currentAccount->name);
   }
   
   Email addMail = mail;
   addMail.from = currentAccount->name;
   addMail.fromMail = currentAccount->emailAddress;
-  addMail.rawMail.prepend("From: " + addMail.from + "<" + addMail.fromMail + ">\n");
+  addMail.rawMail.prepend("From: \"" + addMail.from + "\" <" + addMail.fromMail + ">\n");
   item = new EmailListItem(outboxView, addMail, false);
   
   mailboxView->setCurrentTab(1);
   
 }
 
diff --git a/noncore/unsupported/mailit/emailhandler.cpp b/noncore/unsupported/mailit/emailhandler.cpp
index 5b8bda1..06e978d 100644
--- a/noncore/unsupported/mailit/emailhandler.cpp
+++ b/noncore/unsupported/mailit/emailhandler.cpp
@@ -68,14 +68,16 @@ EmailHandler::EmailHandler()
 }
 
 void EmailHandler::sendMail(QList<Email> *mailList)
 {
   Email *currentMail;
   QString temp;
-  QString userName = mailAccount.name;
-  userName += " <" + mailAccount.emailAddress + ">";
+  QString userName = QString::null;
+  // not supported by ALL SMTP servers in the MAIL From field
+  // userName = "\""+mailAccount.name+"\"";
+  userName += "<" + mailAccount.emailAddress + ">";
   
   for (currentMail = mailList->first(); currentMail != 0;
       currentMail = mailList->next()) {
     
     if (encodeMime(currentMail) == 0) {
       smtpClient->addMail(userName, currentMail->subject,
@@ -439,16 +441,19 @@ int EmailHandler::parse64base(char *src, char *bufOut) {
 
 int EmailHandler::encodeMime(Email *mail) 
 {
   
   QString fileName, fileType, contentType, newBody, boundary;
   Enclosure *ePtr;
+  QString userName;
   
-  QString userName = mailAccount.name;
-  if (userName.length()>0)  //only embrace it if there is a user name
-    userName += " <" + mailAccount.emailAddress + ">";
+  if ( ! mailAccount.name.isEmpty() ) {
+    userName = "\"" + mailAccount.name + "\" <" + mailAccount.emailAddress + ">";
+  } else {
+    userName = "<" + mailAccount.emailAddress + ">";
+  }
   
   //add standard headers
   newBody = "From: " + userName + "\r\nTo: ";
         for (QStringList::Iterator it = mail->recipients.begin(); it != mail->recipients.end(); ++it ) {
     newBody += *it + " ";
   }