diff --git a/overrides/webklex/laravel-imap/src/IMAP/Message.php b/overrides/webklex/laravel-imap/src/IMAP/Message.php
index 1d91d1e8..4ba67ff7 100644
--- a/overrides/webklex/laravel-imap/src/IMAP/Message.php
+++ b/overrides/webklex/laravel-imap/src/IMAP/Message.php
@@ -876,7 +876,7 @@ class Message
                 // }
                 
                 // Try iconv.
-                if (function_exists('iconv') && $from != 'UTF-7' && $to != 'UTF-7') {
+                if (function_exists('iconv') && $from != 'UTF-7' && $to != 'UTF-7' && $from != 'iso-2022-jp-ms') {
                     try {
                         $result = iconv($from, $to.'//IGNORE', $str);
                     } catch (\Exception $e) {
diff --git a/overrides/webklex/php-imap/src/Message.php b/overrides/webklex/php-imap/src/Message.php
index 523affdb..b75ce3f4 100644
--- a/overrides/webklex/php-imap/src/Message.php
+++ b/overrides/webklex/php-imap/src/Message.php
@@ -730,7 +730,7 @@ class Message {
         }
         
         // Try iconv.
-        if (function_exists('iconv') && $from != 'UTF-7' && $to != 'UTF-7') {
+        if (function_exists('iconv') && $from != 'UTF-7' && $to != 'UTF-7' && $from != 'iso-2022-jp-ms') {
             try {
                 $result = iconv($from, $to.'//IGNORE', $str);
             } catch (\Exception $e) {