ZMS-39: Do not strip <> off of message_id

Author: NickOvt

index.js

@@ -1112,7 +1112,7 @@ module.exports.init = function (app, done) {
                     message._from = (entry.from || '').toString();
                     message._to = (entry.to || '').toString();
                     message._mail_action = 'queued';
-                    message._message_id = (entry['message-id'] || entry.messageId || '').toString().replace(/^[\s<]+|[\s>]+$/g, '');
+                    message._message_id = (entry['message-id'] || entry.messageId || '').toString().trim();
                     message._ip = entry.src;
                     message._body_size = entry.body;
                     message._spam_score = Number(entry.score) || '';
@@ -1132,7 +1132,7 @@ module.exports.init = function (app, done) {
                 message._from = (entry.from || '').toString();
                 message._to = (entry.to || '').toString();
                 message._mail_action = 'accepted';
-                message._message_id = (entry['message-id'] || entry.messageId || '').toString().replace(/^[\s<]+|[\s>]+$/g, '');
+                message._message_id = (entry['message-id'] || entry.messageId || '').toString().trim();
                 message._zone = entry.zone;
                 message._mx = entry.mx;
                 message._mx_host = entry.host;
@@ -1157,7 +1157,7 @@ module.exports.init = function (app, done) {
                 message._bounce_count = entry.defcount;
 
                 message._mail_action = 'deferred';
-                message._message_id = (entry['message-id'] || entry.messageId || '').toString().replace(/^[\s<]+|[\s>]+$/g, '');
+                message._message_id = (entry['message-id'] || entry.messageId || '').toString().trim();
 
                 message._zone = entry.zone;
                 message._mx = entry.mx;
@@ -1183,7 +1183,7 @@ module.exports.init = function (app, done) {
                 message._bounce_count = entry.defcount;
 
                 message._mail_action = 'bounced';
-                message._message_id = (entry['message-id'] || entry.messageId || '').toString().replace(/^[\s<]+|[\s>]+$/g, '');
+                message._message_id = (entry['message-id'] || entry.messageId || '').toString().trim();
 
                 message._zone = entry.zone;
                 message._mx = entry.mx;
@@ -1207,7 +1207,7 @@ module.exports.init = function (app, done) {
                 message._to = (entry.to || '').toString();
 
                 message._mail_action = 'dropped';
-                message._message_id = (entry['message-id'] || entry.messageId || '').toString().replace(/^[\s<]+|[\s>]+$/g, '');
+                message._message_id = (entry['message-id'] || entry.messageId || '').toString().trim();
                 message._ip = entry.src;
                 message._body_size = entry.body;
                 message._spam_score = Number(entry.score) || '';