diff --git a/api/src/Mail.php b/api/src/Mail.php
index 83f0460e5f..7452cefae2 100644
--- a/api/src/Mail.php
+++ b/api/src/Mail.php
@@ -1730,7 +1730,10 @@ class Mail
 						$headerObject['ATTACHMENTS'][$mime_id]['uid']=$uid;
 						$headerObject['ATTACHMENTS'][$mime_id]['cid'] = $cid;
 						$headerObject['ATTACHMENTS'][$mime_id]['partID']=$mime_id;
-						if (!isset($headerObject['ATTACHMENTS'][$mime_id]['name']))$headerObject['ATTACHMENTS'][$mime_id]['name']=$part->getName();
+						if (!isset($headerObject['ATTACHMENTS'][$mime_id]['name']))
+						{
+							$headerObject['ATTACHMENTS'][$mime_id]['name']= $part->getName() ? $part->getName() : lang('forwarded message');
+						}
 						if (!strcasecmp($headerObject['ATTACHMENTS'][$mime_id]['name'],'winmail.dat') ||
 							$headerObject['ATTACHMENTS'][$mime_id]['mimeType']=='application/ms-tnef')
 						{