From 4ed742fa4a5fc386f6a942385bc935dbd7b269fe Mon Sep 17 00:00:00 2001
From: yuri <yurikuzn@users.noreply.github.com>
Date: Thu, 9 Nov 2017 11:44:49 +0200
Subject: [PATCH] fix email attachment import for weird formatting by apple
 client

---
 application/Espo/Core/Mail/Parsers/MailMimeParser.php    | 4 +++-
 application/Espo/Core/Mail/Parsers/PhpMimeMailParser.php | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/application/Espo/Core/Mail/Parsers/MailMimeParser.php b/application/Espo/Core/Mail/Parsers/MailMimeParser.php
index fb152351a3..705c3ac3ad 100644
--- a/application/Espo/Core/Mail/Parsers/MailMimeParser.php
+++ b/application/Espo/Core/Mail/Parsers/MailMimeParser.php
@@ -207,8 +207,10 @@ class MailMimeParser
             } else if ($disposition == 'inline') {
                 if ($contentId) {
                     $inlineIds[$contentId] = $attachment->id;
+                    $inlineAttachmentList[] = $attachment;
+                } else {
+                    $email->addLinkMultipleId('attachments', $attachment->id);
                 }
-                $inlineAttachmentList[] = $attachment;
             }
         }
 
diff --git a/application/Espo/Core/Mail/Parsers/PhpMimeMailParser.php b/application/Espo/Core/Mail/Parsers/PhpMimeMailParser.php
index 40f076fd62..508c942676 100644
--- a/application/Espo/Core/Mail/Parsers/PhpMimeMailParser.php
+++ b/application/Espo/Core/Mail/Parsers/PhpMimeMailParser.php
@@ -186,8 +186,10 @@ class PhpMimeMailParser
             } else if ($disposition == 'inline') {
                 if ($contentId) {
                     $inlineIds[$contentId] = $attachment->id;
+                    $inlineAttachmentList[] = $attachment;
+                } else {
+                    $email->addLinkMultipleId('attachments', $attachment->id);
                 }
-                $inlineAttachmentList[] = $attachment;
             }
         }