diff --git a/messagingmenu@lauinger-clan.de/extension.js b/messagingmenu@lauinger-clan.de/extension.js
index d0453e3..743f657 100644
--- a/messagingmenu@lauinger-clan.de/extension.js
+++ b/messagingmenu@lauinger-clan.de/extension.js
@@ -17,29 +17,13 @@ const Gettext = imports.gettext.domain("messagingmenu");
 const _ = Gettext.gettext;
 const ExtensionUtils = imports.misc.extensionUtils;
 const Me = ExtensionUtils.getCurrentExtension();
+const g_schema = "org.gnome.shell.extensions.messagingmenu";
 const _rgbToHex = (r, g, b) =>
     "#" + [r, g, b].map((x) => x.toString(16).padStart(2, "0")).join("");
 
-let ICON_SIZE = 22;
-let _indicator;
-let settings;
-let originalStyle;
-let iconChanged = false;
-let availableNotifiers = new Array();
-let statusArea;
-let iconBox;
-let _queuechanged_handler;
-
-let compatible_Chats;
-let compatible_MBlogs;
-let compatible_Emails;
-// Must be their Notificationtitle, because lookup_app doesnt work here
-let compatible_hidden_Email_Notifiers;
-let compatible_hidden_MBlog_Notifiers;
-
 const MessageMenuItem = GObject.registerClass(
     class MessageMenu_MessageMenuItem extends PopupMenu.PopupBaseMenuItem {
-        _init(app) {
+        _init(app, intIcon_size) {
             super._init();
             this._app = app;
 
@@ -49,7 +33,7 @@ const MessageMenuItem = GObject.registerClass(
             });
             this.add_child(this.label);
 
-            this._icon = app.create_icon_texture(ICON_SIZE);
+            this._icon = app.create_icon_texture(intIcon_size);
             this.add_child(this._icon);
         }
 
@@ -62,8 +46,32 @@ const MessageMenuItem = GObject.registerClass(
 
 const MessageMenu = GObject.registerClass(
     class MessageMenu_MessageMenu extends PanelMenu.Button {
-        _init() {
+        _init(settings, intIcon_size) {
+            this._settings = settings;
+            this._intIcon_size = intIcon_size;
             super._init(0.0, "MessageMenu");
+
+            this._compatible_Chats = this._settings
+                .get_string("compatible-chats")
+                .split(";")
+                .sort();
+            this._compatible_MBlogs = this._settings
+                .get_string("compatible-mblogs")
+                .split(";")
+                .sort(Intl.Collator().compare);
+            this._compatible_Emails = this._settings
+                .get_string("compatible-emails")
+                .split(";")
+                .sort(Intl.Collator().compare);
+            this._compatible_hidden_Email_Notifiers = this._settings
+                .get_string("compatible-hidden-email-notifiers")
+                .split(";")
+                .sort(Intl.Collator().compare);
+            this._compatible_hidden_MBlog_Notifiers = this._settings
+                .get_string("compatible-hidden-mblog-notifiers")
+                .split(";")
+                .sort(Intl.Collator().compare);
+
             let hbox = new St.BoxLayout({
                 style_class: "panel-status-menu-box",
             });
@@ -84,6 +92,7 @@ const MessageMenu = GObject.registerClass(
             this._availableEmails = new Array();
             this._availableChats = new Array();
             this._availableMBlogs = new Array();
+            this._availableNotifiers = new Array();
 
             this._thunderbird = null;
             this._icedove = null;
@@ -117,8 +126,23 @@ const MessageMenu = GObject.registerClass(
             this._buildMenu();
         }
 
+        get AvailableNotifiers() {
+            return this._availableNotifiers;
+        }
+
+        get Compatible_hidden_Email_Notifiers() {
+            return this._compatible_hidden_Email_Notifiers;
+        }
+
+        get Compatible_hidden_MBlog_Notifiers() {
+            return this._compatible_hidden_MBlog_Notifiers;
+        }
+
         _buildMenuEVOLUTION() {
-            let newLauncher = new MessageMenuItem(this._evolution);
+            let newLauncher = new MessageMenuItem(
+                this._evolution,
+                this._intIcon_size
+            );
             this.menu.addMenuItem(newLauncher);
 
             this.comp = new PopupMenu.PopupMenuItem(
@@ -138,7 +162,10 @@ const MessageMenu = GObject.registerClass(
         }
 
         _buildMenuTHUNDERBIRD() {
-            let newLauncher = new MessageMenuItem(this._thunderbird);
+            let newLauncher = new MessageMenuItem(
+                this._thunderbird,
+                this._intIcon_size
+            );
             this.menu.addMenuItem(newLauncher);
 
             this.comp_tb = new PopupMenu.PopupMenuItem(
@@ -159,7 +186,10 @@ const MessageMenu = GObject.registerClass(
         }
 
         _buildMenuICEDOVE() {
-            let newLauncher = new MessageMenuItem(this._icedove);
+            let newLauncher = new MessageMenuItem(
+                this._icedove,
+                this._intIcon_size
+            );
             this.menu.addMenuItem(newLauncher);
 
             this.comp_icedove = new PopupMenu.PopupMenuItem(
@@ -187,7 +217,10 @@ const MessageMenu = GObject.registerClass(
         }
 
         _buildMenuKMAIL() {
-            let newLauncher = new MessageMenuItem(this._kmail);
+            let newLauncher = new MessageMenuItem(
+                this._kmail,
+                this._intIcon_size
+            );
             this.menu.addMenuItem(newLauncher);
 
             this.comp = new PopupMenu.PopupMenuItem(
@@ -202,7 +235,10 @@ const MessageMenu = GObject.registerClass(
         }
 
         _buildMenuCLAWS() {
-            let newLauncher = new MessageMenuItem(this._claws);
+            let newLauncher = new MessageMenuItem(
+                this._claws,
+                this._intIcon_size
+            );
             this.menu.addMenuItem(newLauncher);
 
             this.comp = new PopupMenu.PopupMenuItem(
@@ -217,7 +253,10 @@ const MessageMenu = GObject.registerClass(
         }
 
         _buildMenuGEARY() {
-            let newLauncher = new MessageMenuItem(this._geary);
+            let newLauncher = new MessageMenuItem(
+                this._geary,
+                this._intIcon_size
+            );
             this.menu.addMenuItem(newLauncher);
 
             this.comp = new PopupMenu.PopupMenuItem(
@@ -233,21 +272,30 @@ const MessageMenu = GObject.registerClass(
 
         _buildMenu() {
             for (let e_app of this._availableEmails) {
-                let newLauncher = new MessageMenuItem(e_app);
+                let newLauncher = new MessageMenuItem(
+                    e_app,
+                    this._intIcon_size
+                );
                 this.menu.addMenuItem(newLauncher);
             }
             this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
 
             // insert Chat Clients into menu
             for (let c_app of this._availableChats) {
-                let newLauncher = new MessageMenuItem(c_app);
+                let newLauncher = new MessageMenuItem(
+                    c_app,
+                    this._intIcon_size
+                );
                 this.menu.addMenuItem(newLauncher);
             }
             this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
 
             // insert Blogging Clients into menu
             for (let mb_app of this._availableMBlogs) {
-                let newLauncher = new MessageMenuItem(mb_app);
+                let newLauncher = new MessageMenuItem(
+                    mb_app,
+                    this._intIcon_size
+                );
                 this.menu.addMenuItem(newLauncher);
             }
 
@@ -263,7 +311,7 @@ const MessageMenu = GObject.registerClass(
 
         _getAppsEMAIL(appsys) {
             //get available Email Apps
-            for (let app_name of compatible_Emails) {
+            for (let app_name of this._compatible_Emails) {
                 let app = appsys.lookup_app(app_name + ".desktop");
                 if (app != null) {
                     // filter Apps with special Menus
@@ -282,8 +330,8 @@ const MessageMenu = GObject.registerClass(
                     } else {
                         this._availableEmails.push(app);
                     }
-                    if (settings.get_boolean("notify-email")) {
-                        availableNotifiers.push(app);
+                    if (this._settings.get_boolean("notify-email")) {
+                        this._availableNotifiers.push(app);
                     }
                 }
             }
@@ -291,14 +339,14 @@ const MessageMenu = GObject.registerClass(
 
         _getAppsCHAT(appsys) {
             //get available Chat Apps
-            for (let c_app of compatible_Chats) {
+            for (let c_app of this._compatible_Chats) {
                 let app_name = c_app;
                 let app = appsys.lookup_app(app_name + ".desktop");
 
                 if (app != null) {
                     this._availableChats.push(app);
-                    if (settings.get_boolean("notify-chat")) {
-                        availableNotifiers.push(app);
+                    if (this._settings.get_boolean("notify-chat")) {
+                        this._availableNotifiers.push(app);
                     }
                 }
             }
@@ -306,14 +354,14 @@ const MessageMenu = GObject.registerClass(
 
         _getAppsBLOG(appsys) {
             //get available Blogging Apps
-            for (let mb_app of compatible_MBlogs) {
+            for (let mb_app of this._compatible_MBlogs) {
                 let app_name = mb_app;
                 let app = appsys.lookup_app(app_name + ".desktop");
 
                 if (app != null) {
                     this._availableMBlogs.push(app);
-                    if (settings.get_boolean("notify-mblogging")) {
-                        availableNotifiers.push(app);
+                    if (this._settings.get_boolean("notify-mblogging")) {
+                        this._availableNotifiers.push(app);
                     }
                 }
             }
@@ -361,182 +409,172 @@ const MessageMenu = GObject.registerClass(
     }
 );
 
-function _updateMessageStatus() {
-    // get all Messages
-    let sources = Main.messageTray.getSources();
-    let newMessage = false;
-
-    for (let source of sources) {
-        // check for new Chat Messages
-        if (
-            settings.get_boolean("notify-chat") &&
-            source.isChat &&
-            !source.isMuted &&
-            unseenMessageCheck(source)
-        ) {
-            newMessage = true;
-        } else if (source.app != null) {
-            newMessage = _checkNotifyEmailByID(source);
-        } else {
-            newMessage = _checkNotifyEmailByName(source);
+class MessagingMenu {
+    constructor(uuid) {
+        this._uuid = uuid;
+    }
 
-            if (settings.get_boolean("notify-email")) {
-                newMessage = _checkNotifyHiddenEmail(source);
-            }
-            if (settings.get_boolean("notify-mblogging")) {
-                newMessage = _checkNotifyMBlog(source);
+    _updateMessageStatus() {
+        // get all Messages
+        let sources = Main.messageTray.getSources();
+        let newMessage = false;
+
+        for (let source of sources) {
+            // check for new Chat Messages
+            if (
+                this._settings.get_boolean("notify-chat") &&
+                source.isChat &&
+                !source.isMuted &&
+                this._unseenMessageCheck(source)
+            ) {
+                newMessage = true;
+            } else if (source.app != null) {
+                newMessage = this._checkNotifyEmailByID(source);
+            } else {
+                newMessage = this._checkNotifyEmailByName(source);
+
+                if (this._settings.get_boolean("notify-email")) {
+                    newMessage = this._checkNotifyHiddenEmail(source);
+                }
+                if (this._settings.get_boolean("notify-mblogging")) {
+                    newMessage = this._checkNotifyMBlog(source);
+                }
             }
         }
+        this._changeStatusIcon(newMessage);
     }
-    _changeStatusIcon(newMessage);
-}
 
-function _checkNotifyEmailByID(source) {
-    // check for Message from known Email App
-    let result = false;
-    for (let a_Notifier of availableNotifiers) {
-        let app_id = a_Notifier.get_id(); //e.g. thunderbird.desktop
-        if (app_id.toLowerCase().includes(source.app.get_id().toLowerCase())) {
-            result = true;
+    _checkNotifyEmailByID(source) {
+        // check for Message from known Email App
+        let result = false;
+        for (let a_Notifier of this._indicator.AvailableNotifiers) {
+            let app_id = a_Notifier.get_id(); //e.g. thunderbird.desktop
+            if (
+                app_id.toLowerCase().includes(source.app.get_id().toLowerCase())
+            ) {
+                result = true;
+            }
         }
+        return result;
     }
-    return result;
-}
 
-function _checkNotifyEmailByName(source) {
-    let result = false;
-    for (let a_Notifier of availableNotifiers) {
-        let app_name = a_Notifier.get_name(); //e.g. Thunderbird Mail
-        if (app_name.toLowerCase().includes(source.title.toLowerCase())) {
-            result = true;
+    _checkNotifyEmailByName(source) {
+        let result = false;
+        for (let a_Notifier of this._indicator.AvailableNotifiers) {
+            let app_name = a_Notifier.get_name(); //e.g. Thunderbird Mail
+            if (app_name.toLowerCase().includes(source.title.toLowerCase())) {
+                result = true;
+            }
         }
+        return result;
     }
-    return result;
-}
 
-function _checkNotifyHiddenEmail(source) {
-    let result = false;
-    for (let a_Notifier of compatible_hidden_Email_Notifiers) {
-        let app_name = a_Notifier; //e.g. Mailnag
-        if (app_name.toLowerCase().includes(source.title.toLowerCase())) {
-            result = true;
+    _checkNotifyHiddenEmail(source) {
+        let result = false;
+        for (let a_Notifier of this._indicator
+            .Compatible_hidden_Email_Notifiers) {
+            let app_name = a_Notifier; //e.g. Mailnag
+            if (app_name.toLowerCase().includes(source.title.toLowerCase())) {
+                result = true;
+            }
         }
+        return result;
     }
-    return result;
-}
 
-function _checkNotifyMBlog(source) {
-    let result = false;
-    for (let a_Notifier of compatible_hidden_MBlog_Notifiers) {
-        let app_name = a_Notifier; //e.g. friends
-        if (app_name.toLowerCase().includes(source.title.toLowerCase())) {
-            result = true;
+    _checkNotifyMBlog(source) {
+        let result = false;
+        for (let a_Notifier of this._indicator
+            .Compatible_hidden_MBlog_Notifiers) {
+            let app_name = a_Notifier; //e.g. friends
+            if (app_name.toLowerCase().includes(source.title.toLowerCase())) {
+                result = true;
+            }
         }
+        return result;
     }
-    return result;
-}
 
-function isSupported() {
-    let current_version = Config.PACKAGE_VERSION.split(".");
-    return current_version[0] >= 42 ? true : false;
-}
+    _isSupported() {
+        let current_version = Config.PACKAGE_VERSION.split(".");
+        return current_version[0] >= 42 ? true : false;
+    }
 
-function _changeStatusIcon(newMessage) {
-    // Change Status Icon in Panel
-    if (newMessage && !iconChanged) {
-        let color;
-        if (isSupported) {
-            let strcolor = settings.get_string("color-rgba");
-            let arrColor = strcolor
-                .replace("rgb(", "")
-                .replace(")", "")
-                .split(",");
-            color = _rgbToHex(
-                parseInt(arrColor[0]),
-                parseInt(arrColor[1]),
-                parseInt(arrColor[2])
-            );
-        } else {
-            color = settings.get_string("color");
+    _changeStatusIcon(newMessage) {
+        // Change Status Icon in Panel
+        if (newMessage && !this._iconChanged) {
+            let color;
+            if (this._isSupported) {
+                let strcolor = this._settings.get_string("color-rgba");
+                let arrColor = strcolor
+                    .replace("rgb(", "")
+                    .replace(")", "")
+                    .split(",");
+                color = _rgbToHex(
+                    parseInt(arrColor[0]),
+                    parseInt(arrColor[1]),
+                    parseInt(arrColor[2])
+                );
+            } else {
+                color = this._settings.get_string("color");
+            }
+            this._iconBox.set_style("color: " + color + ";");
+            this._iconChanged = true;
+        } else if (!newMessage && this._iconChanged) {
+            this._iconBox.set_style(this._originalStyle);
+            this._iconChanged = false;
         }
-        iconBox.set_style("color: " + color + ";");
-        iconChanged = true;
-    } else if (!newMessage && iconChanged) {
-        iconBox.set_style(originalStyle);
-        iconChanged = false;
     }
-}
 
-function unseenMessageCheck(source) {
-    let unseen = false;
-    if (source.countVisible == undefined) {
-        unseen = source.unseenCount > 0;
-    } else {
-        unseen = source.countVisible > 0;
+    _unseenMessageCheck(source) {
+        let unseen = false;
+        if (source.countVisible == undefined) {
+            unseen = source.unseenCount > 0;
+        } else {
+            unseen = source.countVisible > 0;
+        }
+        return unseen;
     }
-    return unseen;
-}
 
-function _queuechanged() {
-    try {
-        _updateMessageStatus();
-    } catch (err) {
-        /* If the extension is broken I don't want to break everything.
-         * We just catch the extension, print it and go on */
-        logError(err, "messagingmenu");
+    _queuechanged() {
+        try {
+            this._updateMessageStatus();
+        } catch (err) {
+            /* If the extension is broken I don't want to break everything.
+             * We just catch the extension, print it and go on */
+            logError(err, "messagingmenu");
+        }
     }
-}
 
-function init() {
-    ExtensionUtils.initTranslations("messagingmenu");
-}
+    enable() {
+        this._settings = ExtensionUtils.getSettings(g_schema);
+        let icon_size = this._settings.get_int("icon-size");
+        this._indicator = new MessageMenu(this._settings, icon_size);
+
+        this._queuechanged_handler = Main.messageTray.connect(
+            "queue-changed",
+            this._queuechanged.bind(this)
+        );
 
-function enable() {
-    settings = ExtensionUtils.getSettings(
-        "org.gnome.shell.extensions.messagingmenu"
-    );
-
-    compatible_Chats = settings
-        .get_string("compatible-chats")
-        .split(";")
-        .sort();
-    compatible_MBlogs = settings
-        .get_string("compatible-mblogs")
-        .split(";")
-        .sort(Intl.Collator().compare);
-    compatible_Emails = settings
-        .get_string("compatible-emails")
-        .split(";")
-        .sort(Intl.Collator().compare);
-    compatible_hidden_Email_Notifiers = settings
-        .get_string("compatible-hidden-email-notifiers")
-        .split(";")
-        .sort(Intl.Collator().compare);
-    compatible_hidden_MBlog_Notifiers = settings
-        .get_string("compatible-hidden-mblog-notifiers")
-        .split(";")
-        .sort(Intl.Collator().compare);
-    ICON_SIZE = settings.get_int("icon-size");
-    _indicator = new MessageMenu();
-
-    _queuechanged_handler = Main.messageTray.connect(
-        "queue-changed",
-        this._queuechanged.bind(this)
-    );
-
-    statusArea = Main.panel.statusArea;
-
-    Main.panel.addToStatusArea("messageMenu", _indicator, 1);
-
-    iconBox = statusArea.messageMenu;
-
-    originalStyle = iconBox.get_style();
+        const statusArea = Main.panel.statusArea;
+
+        Main.panel.addToStatusArea("messageMenu", this._indicator, 1);
+
+        this._iconBox = statusArea.messageMenu;
+        this._iconChanged = false;
+        this._originalStyle = this._iconBox.get_style();
+    }
+
+    disable() {
+        Main.messageTray.disconnect(_queuechanged_handler);
+        this._indicator.destroy();
+        this._indicator = null;
+        this._settings = null;
+        this._iconBox = null;
+        this._iconChanged = null;
+        this._originalStyle = null;
+    }
 }
 
-function disable() {
-    Main.messageTray.disconnect(_queuechanged_handler);
-    _indicator.destroy();
-    _indicator = null;
-    settings = null;
-    ICON_SIZE = null;
+function init(meta) {
+    ExtensionUtils.initTranslations("messagingmenu");
+    return new MessagingMenu(meta.uuid);
 }
diff --git a/messagingmenu@lauinger-clan.de/metadata.json b/messagingmenu@lauinger-clan.de/metadata.json
index 747d14c..b3bc516 100644
--- a/messagingmenu@lauinger-clan.de/metadata.json
+++ b/messagingmenu@lauinger-clan.de/metadata.json
@@ -12,6 +12,6 @@
 "gettext-domain": "messagingmenu",
 "description": "A Messaging Menu for the Gnome Shell. All Email and Chat Applications in one Place.",
 "url": "https://github.com/ChrisLauinger77/messagingmenu",
-"version": 35,
+"version": 36,
 "settings-schema": "org.gnome.shell.extensions.messagingmenu"
 }
diff --git a/po/af.po b/po/af.po
index 3b2105e..ab6aa94 100644
--- a/po/af.po
+++ b/po/af.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-04-20 16:38+0200\n"
+"POT-Creation-Date: 2023-04-21 08:56+0200\n"
 "PO-Revision-Date: 2022-11-18 09:56+0100\n"
 "Last-Translator: Christian Lauinger <christian@lauinger-clan.de>\n"
 "Language-Team: \n"
@@ -18,15 +18,15 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 3.2\n"
 
-#: messagingmenu@lauinger-clan.de/extension.js:81
+#: messagingmenu@lauinger-clan.de/extension.js:89
 msgid "Compose New Message"
 msgstr "Skryf Nuwe Boodskap"
 
-#: messagingmenu@lauinger-clan.de/extension.js:82
+#: messagingmenu@lauinger-clan.de/extension.js:90
 msgid "Contacts"
 msgstr "Kontakte"
 
-#: messagingmenu@lauinger-clan.de/extension.js:256
+#: messagingmenu@lauinger-clan.de/extension.js:304
 #: messagingmenu@lauinger-clan.de/prefs.ui:5
 #: messagingmenu@lauinger-clan.de/prefs.ui:9
 msgid "Settings"
diff --git a/po/cz.po b/po/cz.po
index f5d0699..1e4a7ed 100644
--- a/po/cz.po
+++ b/po/cz.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Messaging Menu Version 4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-04-20 16:38+0200\n"
+"POT-Creation-Date: 2023-04-21 08:56+0200\n"
 "PO-Revision-Date: 2022-11-18 09:57+0100\n"
 "Last-Translator: Christian Lauinger <christian@lauinger-clan.de>\n"
 "Language-Team: Czech\n"
@@ -18,15 +18,15 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 "X-Generator: Poedit 3.2\n"
 
-#: messagingmenu@lauinger-clan.de/extension.js:81
+#: messagingmenu@lauinger-clan.de/extension.js:89
 msgid "Compose New Message"
 msgstr "Vytvořit novou zprávu"
 
-#: messagingmenu@lauinger-clan.de/extension.js:82
+#: messagingmenu@lauinger-clan.de/extension.js:90
 msgid "Contacts"
 msgstr "Kontakty"
 
-#: messagingmenu@lauinger-clan.de/extension.js:256
+#: messagingmenu@lauinger-clan.de/extension.js:304
 #: messagingmenu@lauinger-clan.de/prefs.ui:5
 #: messagingmenu@lauinger-clan.de/prefs.ui:9
 msgid "Settings"
diff --git a/po/de.po b/po/de.po
index 3230b4e..81d86fa 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-04-20 16:38+0200\n"
+"POT-Creation-Date: 2023-04-21 08:56+0200\n"
 "PO-Revision-Date: 2023-04-20 16:39+0200\n"
 "Last-Translator: Christian Lauinger <christian@lauinger-clan.de>\n"
 "Language-Team: \n"
@@ -18,15 +18,15 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 3.2.2\n"
 
-#: messagingmenu@lauinger-clan.de/extension.js:81
+#: messagingmenu@lauinger-clan.de/extension.js:89
 msgid "Compose New Message"
 msgstr "Neue Nachricht erstellen"
 
-#: messagingmenu@lauinger-clan.de/extension.js:82
+#: messagingmenu@lauinger-clan.de/extension.js:90
 msgid "Contacts"
 msgstr "Kontakte"
 
-#: messagingmenu@lauinger-clan.de/extension.js:256
+#: messagingmenu@lauinger-clan.de/extension.js:304
 #: messagingmenu@lauinger-clan.de/prefs.ui:5
 #: messagingmenu@lauinger-clan.de/prefs.ui:9
 msgid "Settings"
diff --git a/po/es.po b/po/es.po
index 04c44be..cdec554 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Messaging Menu Version 4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-04-20 16:38+0200\n"
+"POT-Creation-Date: 2023-04-21 08:56+0200\n"
 "PO-Revision-Date: 2022-11-18 09:59+0100\n"
 "Last-Translator: Christian Lauinger <christian@lauinger-clan.de>\n"
 "Language-Team: Spanish\n"
@@ -18,15 +18,15 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 3.2\n"
 
-#: messagingmenu@lauinger-clan.de/extension.js:81
+#: messagingmenu@lauinger-clan.de/extension.js:89
 msgid "Compose New Message"
 msgstr "Crear un Nuevo Mensaje"
 
-#: messagingmenu@lauinger-clan.de/extension.js:82
+#: messagingmenu@lauinger-clan.de/extension.js:90
 msgid "Contacts"
 msgstr "Contactos"
 
-#: messagingmenu@lauinger-clan.de/extension.js:256
+#: messagingmenu@lauinger-clan.de/extension.js:304
 #: messagingmenu@lauinger-clan.de/prefs.ui:5
 #: messagingmenu@lauinger-clan.de/prefs.ui:9
 msgid "Settings"
diff --git a/po/fr.po b/po/fr.po
index e8dd929..0de6953 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Messaging Menu Version 4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-04-20 16:38+0200\n"
+"POT-Creation-Date: 2023-04-21 08:56+0200\n"
 "PO-Revision-Date: 2022-11-18 10:00+0100\n"
 "Last-Translator: Christian Lauinger <christian@lauinger-clan.de>\n"
 "Language-Team: French\n"
@@ -18,15 +18,15 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Generator: Poedit 3.2\n"
 
-#: messagingmenu@lauinger-clan.de/extension.js:81
+#: messagingmenu@lauinger-clan.de/extension.js:89
 msgid "Compose New Message"
 msgstr "Composer un Nouveau Message"
 
-#: messagingmenu@lauinger-clan.de/extension.js:82
+#: messagingmenu@lauinger-clan.de/extension.js:90
 msgid "Contacts"
 msgstr "Contacts"
 
-#: messagingmenu@lauinger-clan.de/extension.js:256
+#: messagingmenu@lauinger-clan.de/extension.js:304
 #: messagingmenu@lauinger-clan.de/prefs.ui:5
 #: messagingmenu@lauinger-clan.de/prefs.ui:9
 msgid "Settings"
diff --git a/po/hu.po b/po/hu.po
index 2cb82f6..3698da3 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Messaging Menu Version 4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-04-20 16:38+0200\n"
+"POT-Creation-Date: 2023-04-21 08:56+0200\n"
 "PO-Revision-Date: 2022-11-18 10:01+0100\n"
 "Last-Translator: Christian Lauinger <christian@lauinger-clan.de>\n"
 "Language-Team: Hungarian\n"
@@ -18,15 +18,15 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 3.2\n"
 
-#: messagingmenu@lauinger-clan.de/extension.js:81
+#: messagingmenu@lauinger-clan.de/extension.js:89
 msgid "Compose New Message"
 msgstr "Új üzenet írása"
 
-#: messagingmenu@lauinger-clan.de/extension.js:82
+#: messagingmenu@lauinger-clan.de/extension.js:90
 msgid "Contacts"
 msgstr "Kapcsolatok"
 
-#: messagingmenu@lauinger-clan.de/extension.js:256
+#: messagingmenu@lauinger-clan.de/extension.js:304
 #: messagingmenu@lauinger-clan.de/prefs.ui:5
 #: messagingmenu@lauinger-clan.de/prefs.ui:9
 msgid "Settings"
diff --git a/po/it.po b/po/it.po
index 408b6ab..4ad7136 100644
--- a/po/it.po
+++ b/po/it.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Messaging Menu Version 4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-04-20 16:38+0200\n"
+"POT-Creation-Date: 2023-04-21 08:56+0200\n"
 "PO-Revision-Date: 2023-03-20 19:02+0100\n"
 "Last-Translator: Albano Battistella <albano_battistella@hotmail.com>\n"
 "Language-Team: Italian\n"
@@ -19,15 +19,15 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 3.2\n"
 
-#: messagingmenu@lauinger-clan.de/extension.js:81
+#: messagingmenu@lauinger-clan.de/extension.js:89
 msgid "Compose New Message"
 msgstr "Componi un Nuovo Messaggio"
 
-#: messagingmenu@lauinger-clan.de/extension.js:82
+#: messagingmenu@lauinger-clan.de/extension.js:90
 msgid "Contacts"
 msgstr "Contatti"
 
-#: messagingmenu@lauinger-clan.de/extension.js:256
+#: messagingmenu@lauinger-clan.de/extension.js:304
 #: messagingmenu@lauinger-clan.de/prefs.ui:5
 #: messagingmenu@lauinger-clan.de/prefs.ui:9
 msgid "Settings"
diff --git a/po/messagingmenu.pot b/po/messagingmenu.pot
index 7a4a84a..db397ff 100644
--- a/po/messagingmenu.pot
+++ b/po/messagingmenu.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-04-20 16:38+0200\n"
+"POT-Creation-Date: 2023-04-21 09:17+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,15 +17,15 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: messagingmenu@lauinger-clan.de/extension.js:81
+#: messagingmenu@lauinger-clan.de/extension.js:89
 msgid "Compose New Message"
 msgstr ""
 
-#: messagingmenu@lauinger-clan.de/extension.js:82
+#: messagingmenu@lauinger-clan.de/extension.js:90
 msgid "Contacts"
 msgstr ""
 
-#: messagingmenu@lauinger-clan.de/extension.js:256
+#: messagingmenu@lauinger-clan.de/extension.js:304
 #: messagingmenu@lauinger-clan.de/prefs.ui:5
 #: messagingmenu@lauinger-clan.de/prefs.ui:9
 msgid "Settings"
diff --git a/po/nl.po b/po/nl.po
index 6da42f0..774b90d 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Messaging Menu Version 4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-04-20 16:38+0200\n"
+"POT-Creation-Date: 2023-04-21 08:56+0200\n"
 "PO-Revision-Date: 2023-04-20 18:10+0200\n"
 "Last-Translator: Heimen Stoffels <vistausss@fastmail.com>\n"
 "Language-Team: \n"
@@ -18,15 +18,15 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 3.2.2\n"
 
-#: messagingmenu@lauinger-clan.de/extension.js:81
+#: messagingmenu@lauinger-clan.de/extension.js:89
 msgid "Compose New Message"
 msgstr "Bericht opstellen"
 
-#: messagingmenu@lauinger-clan.de/extension.js:82
+#: messagingmenu@lauinger-clan.de/extension.js:90
 msgid "Contacts"
 msgstr "Contactpersonen"
 
-#: messagingmenu@lauinger-clan.de/extension.js:256
+#: messagingmenu@lauinger-clan.de/extension.js:304
 #: messagingmenu@lauinger-clan.de/prefs.ui:5
 #: messagingmenu@lauinger-clan.de/prefs.ui:9
 msgid "Settings"
diff --git a/po/pl.po b/po/pl.po
index 457b4f8..eee82b2 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Messaging Menu Version 4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-04-20 16:38+0200\n"
+"POT-Creation-Date: 2023-04-21 08:56+0200\n"
 "PO-Revision-Date: 2022-11-18 10:03+0100\n"
 "Last-Translator: Christian Lauinger <christian@lauinger-clan.de>\n"
 "Language-Team: Polish\n"
@@ -20,15 +20,15 @@ msgstr ""
 "X-Generator: Poedit 3.2\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 
-#: messagingmenu@lauinger-clan.de/extension.js:81
+#: messagingmenu@lauinger-clan.de/extension.js:89
 msgid "Compose New Message"
 msgstr "Napisz nową wiadomość"
 
-#: messagingmenu@lauinger-clan.de/extension.js:82
+#: messagingmenu@lauinger-clan.de/extension.js:90
 msgid "Contacts"
 msgstr "Kontakty"
 
-#: messagingmenu@lauinger-clan.de/extension.js:256
+#: messagingmenu@lauinger-clan.de/extension.js:304
 #: messagingmenu@lauinger-clan.de/prefs.ui:5
 #: messagingmenu@lauinger-clan.de/prefs.ui:9
 msgid "Settings"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 284830c..9b290a7 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Messaging Menu Version 4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-04-20 16:38+0200\n"
+"POT-Creation-Date: 2023-04-21 08:56+0200\n"
 "PO-Revision-Date: 2022-11-11 15:31+0100\n"
 "Last-Translator: Christian Lauinger <christian@lauinger-clan.de>\n"
 "Language-Team: Brazilian Portuguese\n"
@@ -18,15 +18,15 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 3.2\n"
 
-#: messagingmenu@lauinger-clan.de/extension.js:81
+#: messagingmenu@lauinger-clan.de/extension.js:89
 msgid "Compose New Message"
 msgstr "Escrever Nova Mensagem"
 
-#: messagingmenu@lauinger-clan.de/extension.js:82
+#: messagingmenu@lauinger-clan.de/extension.js:90
 msgid "Contacts"
 msgstr "Contatos"
 
-#: messagingmenu@lauinger-clan.de/extension.js:256
+#: messagingmenu@lauinger-clan.de/extension.js:304
 #: messagingmenu@lauinger-clan.de/prefs.ui:5
 #: messagingmenu@lauinger-clan.de/prefs.ui:9
 msgid "Settings"
diff --git a/po/ru.po b/po/ru.po
index 1f28640..d9fbece 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Messaging Menu Version 4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-04-20 16:38+0200\n"
+"POT-Creation-Date: 2023-04-21 08:56+0200\n"
 "PO-Revision-Date: 2022-11-18 10:05+0100\n"
 "Last-Translator: Christian Lauinger <christian@lauinger-clan.de>\n"
 "Language-Team: Russian\n"
@@ -19,15 +19,15 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 3.2\n"
 
-#: messagingmenu@lauinger-clan.de/extension.js:81
+#: messagingmenu@lauinger-clan.de/extension.js:89
 msgid "Compose New Message"
 msgstr "Создать Новое Сообщение"
 
-#: messagingmenu@lauinger-clan.de/extension.js:82
+#: messagingmenu@lauinger-clan.de/extension.js:90
 msgid "Contacts"
 msgstr "Контакты"
 
-#: messagingmenu@lauinger-clan.de/extension.js:256
+#: messagingmenu@lauinger-clan.de/extension.js:304
 #: messagingmenu@lauinger-clan.de/prefs.ui:5
 #: messagingmenu@lauinger-clan.de/prefs.ui:9
 msgid "Settings"
diff --git a/po/tr.po b/po/tr.po
index 952f8b1..49dfeeb 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Messaging Menu Version 4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-04-20 16:38+0200\n"
+"POT-Creation-Date: 2023-04-21 08:56+0200\n"
 "PO-Revision-Date: 2022-11-18 10:05+0100\n"
 "Last-Translator: Christian Lauinger <christian@lauinger-clan.de>\n"
 "Language-Team: Turkish <>\n"
@@ -18,15 +18,15 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Poedit 3.2\n"
 
-#: messagingmenu@lauinger-clan.de/extension.js:81
+#: messagingmenu@lauinger-clan.de/extension.js:89
 msgid "Compose New Message"
 msgstr "Yeni İleti Oluştur"
 
-#: messagingmenu@lauinger-clan.de/extension.js:82
+#: messagingmenu@lauinger-clan.de/extension.js:90
 msgid "Contacts"
 msgstr "Kişiler"
 
-#: messagingmenu@lauinger-clan.de/extension.js:256
+#: messagingmenu@lauinger-clan.de/extension.js:304
 #: messagingmenu@lauinger-clan.de/prefs.ui:5
 #: messagingmenu@lauinger-clan.de/prefs.ui:9
 msgid "Settings"