diff --git a/modules/Settings/MailConverter/handlers/MailRecord.php b/modules/Settings/MailConverter/handlers/MailRecord.php
index ca86736b0cc48c5a30376c882dbf243bc9bf50de..c708905f23018d3fe7f5eaf73baefd05ceb56031 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;