diff --git a/webui/system/helper/mime.php b/webui/system/helper/mime.php
index fd0021ed..b4f835ef 100644
--- a/webui/system/helper/mime.php
+++ b/webui/system/helper/mime.php
@@ -123,6 +123,17 @@ class Piler_Mime_Decode {
                self::splitMessageRaw($msg, $headers, $j, $body);
             }
          }
+
+         // If the message has a single binary attachment, then drop the body part
+         if(isset($headers_array['content-type']['type'])) {
+            foreach(['application/', 'image/'] as $type) {
+               if(strstr($headers_array['content-type']['type'], $type)) {
+                  $body = '';
+                  break;
+               }
+            }
+         }
+
       }
       else {
          $headers = $message;