diff --git a/program/lib/Roundcube/rcube_imap.php b/program/lib/Roundcube/rcube_imap.php
index acd60e72d73..d4ebb42ce07 100644
--- a/program/lib/Roundcube/rcube_imap.php
+++ b/program/lib/Roundcube/rcube_imap.php
@@ -2230,9 +2230,9 @@ protected function structure_part($part, $count = 0, $parent = '', $mime_headers
             }
         }
 
-        // fetch message headers if message/rfc822 or named part (could contain Content-Location header)
+        // fetch message headers if message/rfc822 or image or named part (could contain Content-Location header)
         if (
-            $struct->ctype_primary == 'message'
+            $struct->ctype_primary == 'message' || $struct->ctype_primary == 'image'
             || (!empty($struct->ctype_parameters['name']) && !empty($struct->content_id))
         ) {
             if (empty($mime_headers)) {