From a753296d6938f486e44e79aa972538bb292b1757 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hnategh@gmail.com>
Date: Tue, 30 Jul 2019 12:14:42 +0200
Subject: [PATCH] Call no named attachment "forwarded message" only if it's a
 message

---
 api/src/Mail.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/api/src/Mail.php b/api/src/Mail.php
index 3fb489819b..66aa568cc2 100644
--- a/api/src/Mail.php
+++ b/api/src/Mail.php
@@ -1737,7 +1737,8 @@ class Mail
 						$headerObject['ATTACHMENTS'][$mime_id]['partID']=$mime_id;
 						if (!isset($headerObject['ATTACHMENTS'][$mime_id]['name']))
 						{
-							$headerObject['ATTACHMENTS'][$mime_id]['name']= $part->getName() ? $part->getName() : lang('forwarded message');
+							$headerObject['ATTACHMENTS'][$mime_id]['name']= $part->getName() ? $part->getName() :
+								($mime_type == "message/rfc822" ? lang('forwarded message') : lang('attachment'));
 						}
 						if (!strcasecmp($headerObject['ATTACHMENTS'][$mime_id]['name'],'winmail.dat') ||
 							$headerObject['ATTACHMENTS'][$mime_id]['mimeType']=='application/ms-tnef')
@@ -5784,7 +5785,7 @@ class Mail
 				$attachment['mimeType'] = $mime_type;
 				$attachment['uid'] = $_uid;
 				$attachment['partID'] = $mime_id;
-				if (!isset($attachment['name'])||empty($attachment['name'])) $attachment['name'] = $part->getName() ? $part->getName() : lang('forwarded message');
+				if (!isset($attachment['name'])||empty($attachment['name'])) $attachment['name'] = $part->getName() ? $part->getName() : ($mime_type == "message/rfc822" ? lang('forwarded message') : lang('attachment'));;
 				if ($fetchTextCalendar)
 				{
 					//error_log(__METHOD__.' ('.__LINE__.') '.array2string($part->getAllContentTypeParameters()));