1 files changed, 7 insertions, 8 deletions

diff --git a/noncore/net/mail/libmailwrapper/genericwrapper.cpp b/noncore/net/mail/libmailwrapper/genericwrapper.cpp
index 3e4293b..1caa375 100644
--- a/noncore/net/mail/libmailwrapper/genericwrapper.cpp
+++ b/noncore/net/mail/libmailwrapper/genericwrapper.cpp
@@ -139,3 +139,3 @@ void Genericwrapper::traverseBody(RecBodyP&target,mailmessage*message,mailmime*m
     if (current_rec >= 10) {
-        odebug << "too deep recursion!" << oendl; 
+        odebug << "too deep recursion!" << oendl;
     }
@@ -276,3 +276,3 @@ QString Genericwrapper::parseAddressList( mailimf_address_list *list )
             default:
-                odebug << "Generic: unkown mailimf address type" << oendl; 
+                odebug << "Generic: unkown mailimf address type" << oendl;
                 break;
@@ -369,3 +369,3 @@ void Genericwrapper::cleanMimeCache()
     bodyCache.clear();
-    odebug << "Genericwrapper: cache cleaned" << oendl; 
+    odebug << "Genericwrapper: cache cleaned" << oendl;
 }
@@ -398,3 +398,3 @@ void Genericwrapper::parseList(QValueList<Opie::Core::OSmartPointer<RecMail> > &
     if (r != MAIL_NO_ERROR) {
-        odebug << "Error message list" << oendl; 
+        odebug << "Error message list" << oendl;
         return;
@@ -403,3 +403,3 @@ void Genericwrapper::parseList(QValueList<Opie::Core::OSmartPointer<RecMail> > &
     if (r != MAIL_NO_ERROR) {
-        odebug << "Error filling message list" << oendl; 
+        odebug << "Error filling message list" << oendl;
         if (env_list) {
@@ -417,3 +417,3 @@ void Genericwrapper::parseList(QValueList<Opie::Core::OSmartPointer<RecMail> > &
         if (msg->msg_fields == NULL) {
-            //odebug << "could not fetch envelope of message " << i << "" << oendl; 
+            //odebug << "could not fetch envelope of message " << i << "" << oendl;
             continue;
@@ -450,5 +450,4 @@ void Genericwrapper::parseList(QValueList<Opie::Core::OSmartPointer<RecMail> > &
         // crashes when accessing pop3 account?
-        if (single_fields.fld_message_id->mid_value) {
+        if (single_fields.fld_message_id && single_fields.fld_message_id->mid_value) {
             mail->setMsgid(QString(single_fields.fld_message_id->mid_value));
-            odebug << "Msgid == " << mail->Msgid().latin1() << "" << oendl; 
         }