Index: /trunk/roundcubemail/program/steps/mail/func.inc
===================================================================
--- /trunk/roundcubemail/program/steps/mail/func.inc	(revision 2769)
+++ /trunk/roundcubemail/program/steps/mail/func.inc	(revision 2770)
@@ -988,5 +988,5 @@
       if ($part->type == 'headers')
         $out .= rcmail_message_headers(sizeof($header_attrib) ? $header_attrib : NULL, $part->headers);
-      else if ($part->type == 'content')
+      else if ($part->type == 'content' && $part->size)
         {
         if (empty($part->ctype_parameters) || empty($part->ctype_parameters['charset']))
Index: /trunk/roundcubemail/program/steps/mail/get.inc
===================================================================
--- /trunk/roundcubemail/program/steps/mail/get.inc	(revision 2769)
+++ /trunk/roundcubemail/program/steps/mail/get.inc	(revision 2770)
@@ -114,5 +114,5 @@
       if ($part->body)
         echo $part->body;
-      else
+      else if ($part->size)
         $IMAP->get_message_part($MESSAGE->uid, $part->mime_id, $part, true);
     }