1 files changed, 3 insertions, 0 deletions

diff --git a/noncore/net/mail/libmailwrapper/abstractmail.cpp b/noncore/net/mail/libmailwrapper/abstractmail.cpp
index f40aac8..5a8ada6 100644
--- a/noncore/net/mail/libmailwrapper/abstractmail.cpp
+++ b/noncore/net/mail/libmailwrapper/abstractmail.cpp
@@ -79,24 +79,27 @@ encodedString* AbstractMail::decode_String(const encodedString*text,const QStrin
         result->setContent(result_text,target_length);
     }
     odebug << "Decode string finished" << oendl;
     return result;
 }
 
 QString AbstractMail::convert_String(const char*text)
 {
     size_t index = 0;
     char*res = 0;
     int err = MAILIMF_NO_ERROR;
 
+    if (!text) {
+        return QString("");
+    }
     QString result(text);
 
     err = mailmime_encoded_phrase_parse("iso-8859-1",
         text, strlen(text),&index, "iso-8859-1",&res);
     //odebug << "Input: " << text << "" << oendl;
     if (err == MAILIMF_NO_ERROR && res && strlen(res)) {
         result = QString(res);
 //        odebug << "Res: " << res << ", length: " << strlen(res) << "" << oendl;
     }
     if (res) free(res);
     return result;
 }