From 3a097e6836293b31a0cf2159dde4b23345ccd32e Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Mon, 21 Oct 2019 16:59:50 +0200
Subject: [PATCH] Fix bug where inline images could have been ignored if
 Content-Id header contained redundant spaces (#6980)

---
 CHANGELOG                            | 1 +
 program/lib/Roundcube/rcube_imap.php | 3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 08cff0cd4..01fbdccd4 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -11,6 +11,7 @@ CHANGELOG Roundcube Webmail
 - Archive: Fix missing Archive icon in folder selector popup in Elastic
 - Fix bug where cache keys were not case-sensitive on MySQL/MSSQL (#6942)
 - Fix so an error is loogged when encryption fails (#6948)
+- Fix bug where inline images could have been ignored if Content-Id header contained redundant spaces (#6980)
 
 RELEASE 1.4-rc2
 ---------------
diff --git a/program/lib/Roundcube/rcube_imap.php b/program/lib/Roundcube/rcube_imap.php
index 6e36b69af..eafb94394 100644
--- a/program/lib/Roundcube/rcube_imap.php
+++ b/program/lib/Roundcube/rcube_imap.php
@@ -2180,8 +2180,7 @@ class rcube_imap extends rcube_storage
 
         // get part ID
         if (!empty($part[3])) {
-            $struct->content_id = $part[3];
-            $struct->headers['content-id'] = $part[3];
+            $struct->content_id = $struct->headers['content-id'] = trim($part[3]);
 
             if (empty($struct->disposition)) {
                 $struct->disposition = 'inline';