From 5687293fbd9308b09ccf06c99620cab6cdbb582c Mon Sep 17 00:00:00 2001
From: Prasad <prasad@vtiger.com>
Date: Sat, 20 Apr 2024 20:19:59 +0530
Subject: [PATCH] Fixes #1807: special case handled for default charset return
 of imap decode

---
 modules/Settings/MailConverter/handlers/MailRecord.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/Settings/MailConverter/handlers/MailRecord.php b/modules/Settings/MailConverter/handlers/MailRecord.php
index ca86736b0..c708905f2 100644
--- a/modules/Settings/MailConverter/handlers/MailRecord.php
+++ b/modules/Settings/MailConverter/handlers/MailRecord.php
@@ -143,7 +143,8 @@ class Vtiger_MailRecord {
 		if ($iconv_function === NULL) $iconv_function = function_exists('iconv');
 
 		if($mb_function) {
-			if(!$from) $from = mb_detect_encoding($input);
+			// if source charset is not determined or not-encoded as per imap_mime_decode
+			if(!$from || $from == 'default') $from = mb_detect_encoding($input);
 
 			if(strtolower(trim($to)) == strtolower(trim($from))) {                         
 					return $input;
-- 
GitLab