diff --git a/mail_activity_board/static/src/components/chatter_topbar/chatter_topbar.esm.js b/mail_activity_board/static/src/components/chatter_topbar/chatter_topbar.esm.js
index 253eea1c1..0f63ec45f 100644
--- a/mail_activity_board/static/src/components/chatter_topbar/chatter_topbar.esm.js
+++ b/mail_activity_board/static/src/components/chatter_topbar/chatter_topbar.esm.js
@@ -1,8 +1,7 @@
 /** @odoo-module **/
-import {patch} from "web.utils";
 import {ChatterTopbar} from "@mail/components/chatter_topbar/chatter_topbar";
+import {patch} from "web.utils";
 const components = {ChatterTopbar};
-// Import {rpc}
 import rpc from "web.rpc";
 
 patch(
diff --git a/mail_tracking/static/src/js/chatter.esm.js b/mail_tracking/static/src/js/chatter.esm.js
index 87a488746..dec5429f3 100644
--- a/mail_tracking/static/src/js/chatter.esm.js
+++ b/mail_tracking/static/src/js/chatter.esm.js
@@ -1,10 +1,9 @@
 /** @odoo-module **/
-
-import {attr} from "@mail/model/model_field";
 import {
     registerFieldPatchModel,
     registerInstancePatchModel,
 } from "@mail/model/model_core";
+import {attr} from "@mail/model/model_field";
 
 registerInstancePatchModel(
     "mail.chatter",
diff --git a/mail_tracking/static/src/js/discuss/discuss.esm.js b/mail_tracking/static/src/js/discuss/discuss.esm.js
index 235b4902c..dba850778 100644
--- a/mail_tracking/static/src/js/discuss/discuss.esm.js
+++ b/mail_tracking/static/src/js/discuss/discuss.esm.js
@@ -61,7 +61,8 @@ registerInstancePatchModel(
             } else {
                 this.messaging.update({
                     userSetting: insertAndReplace({
-                        id: -1, // Fake id for guest
+                        // Fake id for guest
+                        id: -1,
                     }),
                 });
             }
diff --git a/mail_tracking/static/src/js/failed_message/mail_failed_box.esm.js b/mail_tracking/static/src/js/failed_message/mail_failed_box.esm.js
index a30ac5bf7..71d49e43c 100644
--- a/mail_tracking/static/src/js/failed_message/mail_failed_box.esm.js
+++ b/mail_tracking/static/src/js/failed_message/mail_failed_box.esm.js
@@ -1,19 +1,9 @@
 /** @odoo-module **/
 
-// const chatter = require("mail/static/src/models/chatter/chatter.js");
-// const useStore = require("mail/static/src/component_hooks/use_store/use_store.js");
 import {registerMessagingComponent} from "@mail/utils/messaging_component";
 const {Component} = owl;
 
 export class MessageFailedBox extends Component {
-    constructor(...args) {
-        super(...args);
-    }
-
-    //    Get chatter() {
-    //        return this.env.models["mail.chatter"].get(this.props.chatterLocalId);
-    //    }
-
     _onClickTitle() {
         this.chatter.toggleMessageFailedBoxVisibility();
     }
diff --git a/mail_tracking/static/src/js/models/thread.esm.js b/mail_tracking/static/src/js/models/thread.esm.js
index 1f606dc00..6584ab0cb 100644
--- a/mail_tracking/static/src/js/models/thread.esm.js
+++ b/mail_tracking/static/src/js/models/thread.esm.js
@@ -1,17 +1,17 @@
 /** @odoo-module **/
-import {registerNewModel} from "@mail/model/model_core";
 import {attr, many2one} from "@mail/model/model_field";
+import {registerNewModel} from "@mail/model/model_core";
 
 function factory(dependencies) {
     class MessageFailed extends dependencies["mail.model"] {
         static convertData(data) {
             const data2 = {};
             if ("author" in data) {
-                if (!data.author) {
-                    data2.author = [["unlink-all"]];
-                } else {
+                if (data.author) {
                     data2.author = data.author[1];
                     data2.author_id = data.author[0];
+                } else {
+                    data2.author = [["unlink-all"]];
                 }
             }
             if ("body" in data) {