diff --git a/Blacklight/Binaries.php b/Blacklight/Binaries.php
index 94675c967..194f62bcf 100755
--- a/Blacklight/Binaries.php
+++ b/Blacklight/Binaries.php
@@ -895,6 +895,9 @@ class Binaries
                 $binariesUpdate[$binaryID]['Parts']++;
             }
 
+            // In case there are quotes in the message id
+            $this->header['Message-ID'] = addslashes($this->header['Message-ID']);
+
             // Strip the < and >, saves space in DB.
             $this->header['Message-ID'][0] = "'";