and of course I'll find a bug 10 minutes after checkin ....

2 files changed, 6 insertions, 2 deletions

diff --git a/noncore/net/mail/imapwrapper.cpp b/noncore/net/mail/imapwrapper.cpp
index da5974c..7b75ffa 100644
--- a/noncore/net/mail/imapwrapper.cpp
+++ b/noncore/net/mail/imapwrapper.cpp
@@ -649,14 +649,16 @@ void IMAPwrapper::fillSingleBasicPart(RecPart&target_part,mailimap_body_type_bas
 void IMAPwrapper::fillBodyFields(RecPart&target_part,mailimap_body_fields*which)
 {
     if (!which) return;
+    if (which->bd_parameter && which->bd_parameter->pa_list && which->bd_parameter->pa_list->count>0) {
     clistcell*cur;
-    mailimap_single_body_fld_param*param;
+        mailimap_single_body_fld_param*param=0;
     for (cur = clist_begin(which->bd_parameter->pa_list);cur!=NULL;cur=clist_next(cur)) {
         param = (mailimap_single_body_fld_param*)cur->data;
         if (param) {
             target_part.addParameter(QString(param->pa_name).lower(),QString(param->pa_value));
         }
     }
+    }
     mailimap_body_fld_enc*enc = which->bd_encoding;
     QString encoding("");
     switch (enc->enc_type) {
diff --git a/noncore/net/mail/libmailwrapper/imapwrapper.cpp b/noncore/net/mail/libmailwrapper/imapwrapper.cpp
index da5974c..7b75ffa 100644
--- a/noncore/net/mail/libmailwrapper/imapwrapper.cpp
+++ b/noncore/net/mail/libmailwrapper/imapwrapper.cpp
@@ -649,14 +649,16 @@ void IMAPwrapper::fillSingleBasicPart(RecPart&target_part,mailimap_body_type_bas
 void IMAPwrapper::fillBodyFields(RecPart&target_part,mailimap_body_fields*which)
 {
     if (!which) return;
+    if (which->bd_parameter && which->bd_parameter->pa_list && which->bd_parameter->pa_list->count>0) {
     clistcell*cur;
-    mailimap_single_body_fld_param*param;
+        mailimap_single_body_fld_param*param=0;
     for (cur = clist_begin(which->bd_parameter->pa_list);cur!=NULL;cur=clist_next(cur)) {
         param = (mailimap_single_body_fld_param*)cur->data;
         if (param) {
             target_part.addParameter(QString(param->pa_name).lower(),QString(param->pa_value));
         }
     }
+    }
     mailimap_body_fld_enc*enc = which->bd_encoding;
     QString encoding("");
     switch (enc->enc_type) {