1 files changed, 7 insertions, 10 deletions

diff --git a/noncore/net/mail/libmailwrapper/abstractmail.cpp b/noncore/net/mail/libmailwrapper/abstractmail.cpp
index b7e5eaa..3d76c96 100644
--- a/noncore/net/mail/libmailwrapper/abstractmail.cpp
+++ b/noncore/net/mail/libmailwrapper/abstractmail.cpp
@@ -49,23 +49,20 @@ encodedString* AbstractMail::decode_String(const encodedString*text,const QStrin
 
 QString AbstractMail::convert_String(const char*text)
 {
-#if 0
     size_t index = 0;
     char*res = 0;
    
-        qDebug("encode start %s",text); 
-        /* attention - doesn't work with arm systems! */
+    /* attention - doesn't work with arm systems! */
     int err = mailmime_encoded_phrase_parse("iso-8859-1",
         text, strlen(text),&index, "iso-8859-1",&res);
-        qDebug("encode end"); 
     if (err != MAILIMF_NO_ERROR) {
         if (res) free(res);
         return QString(text);
     }
-    QString result(res);
-    free(res);
-    return result;
-#else
-        return QString(text);
-#endif
+    if (res) {
+        QString result(res);
+        free(res);
+        return result;
+    }
+    return QString(text);
 }