diff --git a/mail_fix_553/__manifest__.py b/mail_fix_553/__manifest__.py
index e6529c2..5639f3c 100644
--- a/mail_fix_553/__manifest__.py
+++ b/mail_fix_553/__manifest__.py
@@ -1,3 +1,4 @@
+# pylint: disable=manifest-version-format
 {
     "name": "Fix mail error 553",
     "version": "0.3",
diff --git a/mail_fix_553/mail_fix_553.py b/mail_fix_553/mail_fix_553.py
index 890f29d..b69c96d 100644
--- a/mail_fix_553/mail_fix_553.py
+++ b/mail_fix_553/mail_fix_553.py
@@ -1,3 +1,4 @@
+# pylint: disable=old-api7-method-defined,invalid-commit
 import base64
 import logging
 import re
@@ -5,7 +6,7 @@ from email.utils import formataddr
 
 from odoo import SUPERUSER_ID, tools
 from odoo.osv import osv
-from odoo.tools.safe_eval import safe_eval as eval
+from odoo.tools.safe_eval import safe_eval
 from odoo.tools.translate import _
 
 from odoo.addons.base.ir.ir_mail_server import MailDeliveryException
@@ -115,7 +116,7 @@ class MailMail(osv.Model):
                         )
                 if mail.headers:
                     try:
-                        headers.update(eval(mail.headers))
+                        headers.update(safe_eval(mail.headers))
                     except Exception:
                         pass
 
diff --git a/mail_move_message/static/src/js/mail_move_message.js b/mail_move_message/static/src/js/mail_move_message.js
index 0a8e580..5f320c1 100644
--- a/mail_move_message/static/src/js/mail_move_message.js
+++ b/mail_move_message/static/src/js/mail_move_message.js
@@ -1,3 +1,5 @@
+/* eslint no-unused-vars: "off"*/
+
 /* Copyright 2016 Ildar Nasyrov <https://it-projects.info/team/iledarn>
 # Copyright 2016 Ivan Yelizariev <https://it-projects.info/team/yelizariev>
 # Copyright 2016 Pavel Romanchenko
@@ -7,25 +9,13 @@
 odoo.define("mail_move_message.relocate", function(require) {
     "use strict";
 
-    var bus = require("bus.bus").bus;
     var chat_manager = require("mail_base.base").chat_manager;
     var thread = require("mail.ChatThread");
     var chatter = require("mail.Chatter");
-    var rpc = require("web.rpc");
     var Basicmodel = require("web.BasicModel");
-    var view_dialogs = require("web.view_dialogs");
-    var field_utils_format = require("web.field_utils").format;
-    var BasicRenderer = require("web.BasicRenderer");
     var core = require("web.core");
-    var form_widget = require("web.FormRenderer");
-    var session = require("web.Session");
     var FormController = require("web.FormController");
-    var FormView = require("web.FormView");
-    var FormRenderer = require("web.FormRenderer");
-    var dialogs = require("web.view_dialogs");
-    var Dialog = require("web.Dialog");
     var relational_fields = require("web.relational_fields");
-    var Widget = require("web.Widget");
 
     var _t = core._t;
 
@@ -50,7 +40,9 @@ odoo.define("mail_move_message.relocate", function(require) {
                 context: {default_message_id: message_id},
             };
             this.do_action(action, {
-                on_close: function() {},
+                on_close: function() {
+                    // Empty
+                },
             });
         },
     });
@@ -60,10 +52,12 @@ odoo.define("mail_move_message.relocate", function(require) {
             var result = this._super.apply(this, arguments);
             // For show wizard in the form
             if (this.fields.thread && this.fields.thread.thread) {
-                var thread = this.fields.thread.thread;
+                thread = this.fields.thread.thread;
                 thread.on("move_message", this, thread.on_move_message);
             }
-            return $.when(result).done(function() {});
+            return $.when(result).done(function() {
+                // Empty
+            });
         },
     });
 
@@ -73,7 +67,9 @@ odoo.define("mail_move_message.relocate", function(require) {
             var result = this._super.apply(this, arguments);
             // For show wizard in the channels
             this.thread.on("move_message", this, this.thread.on_move_message);
-            return $.when(result).done(function() {});
+            return $.when(result).done(function() {
+                // Empty
+            });
         },
     });
 
@@ -127,6 +123,7 @@ odoo.define("mail_move_message.relocate", function(require) {
             ) {
                 var self = this;
                 var field_data = event.data.record.data;
+                // TODO: it seems like debugging, test without this code
                 this.on_saved = function(record, bool) {
                     var values = [
                         {
@@ -149,6 +146,7 @@ odoo.define("mail_move_message.relocate", function(require) {
                     // Necessary for correct _trigger_up implementation in mixins.js
                     return self;
                 };
+                // TODO: it seems like debugging, test without this code
                 var wizard_popup = relField._searchCreatePopup("form", false, {
                     message_name_from:
                         field_data.message_name_from &&
diff --git a/mail_private/static/src/js/mail_private.js b/mail_private/static/src/js/mail_private.js
index 951c293..9d3d2f1 100644
--- a/mail_private/static/src/js/mail_private.js
+++ b/mail_private/static/src/js/mail_private.js
@@ -7,7 +7,6 @@
 odoo.define("mail_private", function(require) {
     "use strict";
 
-    var core = require("web.core");
     var Chatter = require("mail.Chatter");
     var ChatterComposer = require("mail.ChatterComposer");
     var chat_manager = require("mail_base.base").chat_manager;
@@ -174,7 +173,9 @@ odoo.define("mail_private", function(require) {
                 }
 
                 // Partner_ids
-                if (!self.options.is_log) {
+                if (self.options.is_log) {
+                    def.resolve(message);
+                } else {
                     var checked_suggested_partners = self.get_checked_suggested_partners();
                     self.check_suggested_partners(checked_suggested_partners).done(
                         function(partner_ids) {
@@ -188,8 +189,6 @@ odoo.define("mail_private", function(require) {
                             def.resolve(message);
                         }
                     );
-                } else {
-                    def.resolve(message);
                 }
             });
             return def;