From dbd4e20c344666a01cfb1fa5dfdd5547a59f0520 Mon Sep 17 00:00:00 2001
From: smizrahi <seb.mizrahi@gmail.com>
Date: Thu, 6 Apr 2023 09:13:08 +0200
Subject: [PATCH] fix(mail): Fix images in attachements when replying to a
 mail. Fixes #5731

---
 SoObjects/Mailer/SOGoDraftObject.m | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/SoObjects/Mailer/SOGoDraftObject.m b/SoObjects/Mailer/SOGoDraftObject.m
index 20f256144..d5b723042 100644
--- a/SoObjects/Mailer/SOGoDraftObject.m
+++ b/SoObjects/Mailer/SOGoDraftObject.m
@@ -872,7 +872,10 @@ static NSString    *userAgent      = nil;
     {
       currentInfo = [attachments objectAtIndex: count];
       if (!onlyImages
-        || (onlyImages && [[NGMimeBodyPart imageMimeTypes] containsObject: [currentInfo objectForKey: @"mimetype"]])) {
+        || (onlyImages 
+              && [[NGMimeBodyPart imageMimeTypes] containsObject: [currentInfo objectForKey: @"mimetype"]] 
+              && [currentInfo objectForKey: @"bodyId"] 
+              && [[currentInfo objectForKey: @"bodyId"]  length] > 0)) {
         [self saveAttachment: [currentInfo objectForKey: @"body"]
               withMetadata: currentInfo];
       }