2 files changed, 16 insertions, 12 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
@@ -646,18 +646,20 @@ void IMAPwrapper::fillSingleBasicPart(RecPart&target_part,mailimap_body_type_bas
     fillBodyFields(target_part,which->bd_fields);
 }
 
 void IMAPwrapper::fillBodyFields(RecPart&target_part,mailimap_body_fields*which)
 {
     if (!which) return;
-    clistcell*cur;
-    mailimap_single_body_fld_param*param;
-    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));
+    if (which->bd_parameter && which->bd_parameter->pa_list && which->bd_parameter->pa_list->count>0) {
+        clistcell*cur;
+        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) {
     case MAILIMAP_BODY_FLD_ENC_7BIT:
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
@@ -646,18 +646,20 @@ void IMAPwrapper::fillSingleBasicPart(RecPart&target_part,mailimap_body_type_bas
     fillBodyFields(target_part,which->bd_fields);
 }
 
 void IMAPwrapper::fillBodyFields(RecPart&target_part,mailimap_body_fields*which)
 {
     if (!which) return;
-    clistcell*cur;
-    mailimap_single_body_fld_param*param;
-    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));
+    if (which->bd_parameter && which->bd_parameter->pa_list && which->bd_parameter->pa_list->count>0) {
+        clistcell*cur;
+        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) {
     case MAILIMAP_BODY_FLD_ENC_7BIT: