Merge branch 'sunweaver-pr/update-translations'

Attributes GH PR #32: https://github.com/AyatanaIndicators/ayatana-webmail/pull/32

138 files changed, 20739 insertions, 14099 deletions

diff --git a/po/LINGUAS b/po/LINGUAS
new file mode 100644
index 0000000..5a4bd9c
--- /dev/null
+++ b/po/LINGUAS
@@ -0,0 +1,132 @@
+af
+am
+an
+ar
+ast
+az
+bem
+be
+bg
+bn
+bo
+br
+bs
+ca
+ca@valencia
+ce
+ckb
+co
+crh
+cs
+cv
+cy
+da
+de
+el
+en_AU
+en_CA
+en_GB
+eo
+es
+et
+eu
+fa
+fil
+fi
+fo
+fr_CA
+fr
+frp
+fy
+ga
+gd
+gl
+gu
+he
+hi
+hr
+ht
+hu
+hy
+ia
+id
+is
+it
+ja
+ka
+kk
+kl
+km
+kn
+ko
+kw
+ky
+la
+lb
+lo
+lt
+lv
+mg
+mhr
+mi
+ml
+mr
+ms
+my
+nb
+ne
+nl
+nn
+oc
+os
+pa
+pl
+ps
+pt_BR
+pt
+ro
+ru
+sa
+sc
+sd
+se
+shn
+si
+sk
+sl
+sq
+sr
+sv
+sw
+szl
+ta
+te
+tg
+th
+ti
+tr
+ug
+uk
+ur
+uz
+vi
+wae
+zh_CN
+zh_HK
+ny
+aa
+as
+wo
+gv
+fur
+it_CARES
+dv
+mk
+vec
+csb
+tt
+ta_LK
+zh_LATN@pinyin
+zh_TW
+kmr
+sdh
diff --git a/po/POTFILES.in b/po/POTFILES.in
new file mode 100644
index 0000000..7b745ca
--- /dev/null
+++ b/po/POTFILES.in
@@ -0,0 +1,10 @@
+ayatanawebmail/accounts.py
+ayatanawebmail/actions.py
+ayatanawebmail/appdata.py
+ayatanawebmail/application.py
+ayatanawebmail/common.py
+ayatanawebmail/dialog.py
+ayatanawebmail/idler.py
+ayatanawebmail/imaplib2.py
+ayatanawebmail/__init__.py
+data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml
diff --git a/po/aa.po b/po/aa.po
index 0afec04..6b841ce 100644
--- a/po/aa.po
+++ b/po/aa.po
@@ -6,9 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail 22.6.28\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/"
-"issues\n"
-"POT-Creation-Date: 2020-08-22 20:15+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -18,300 +17,329 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr ""
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr ""
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr ""
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:204
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr ""
 
-#: ayatanawebmail/application.py:211
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr ""
 
-#: ayatanawebmail/application.py:218
-#: data/usr/share/applications/ayatana-webmail.desktop:35
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr ""
 
-#: ayatanawebmail/application.py:957
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:1110
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr ""
 
-#: ayatanawebmail/application.py:1111
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
-msgid "Unable to connect to account \"{accountName}\", the application will now exit."
+msgid ""
+"Unable to connect to account \"{accountName}\", the application will now "
+"exit."
 msgstr ""
 
-#: ayatanawebmail/application.py:1136
+#: /ayatanawebmail/application.py:1131
 #, python-format
-msgid "You have %d unread mail"
-msgid_plural "You have %d unread mails"
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ayatanawebmail/application.py:1163
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr ""
 
-#: ayatanawebmail/application.py:1165
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1167
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1180
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:60
-msgid "If this string starts with http:// or https://, the application will open it in your browser - otherwise, it will be run as a command"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:61
+msgid ""
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:90 ayatanawebmail/dialog.py:104
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:132
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:140
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:141
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:142
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:143
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:204
-msgid "Please visit the following link and enable access for less secure apps:"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:206
-msgid "Access blocked by Google"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:210
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:211
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:234
-msgid "Custom"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:242
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:244
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:286
-msgid "The application will append this string to \"Inbox\" to access a specific message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+#: /ayatanawebmail/dialog.py:276
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:288
+#: /ayatanawebmail/dialog.py:278
 msgid "Account:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:290
+#: /ayatanawebmail/dialog.py:280
 msgid "Server:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:292
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:294
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:296
+#: /ayatanawebmail/dialog.py:286
 msgid "Username:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:298
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:300
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:302
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:296
 msgid "Sent:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:308
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:310
+#: /ayatanawebmail/dialog.py:300
 msgid "Message:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:346
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:347
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:348
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:358
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:360
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:362
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:364
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:369
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:376
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:392
+#: /ayatanawebmail/dialog.py:382
 msgid "Report a bug"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:394
+#: /ayatanawebmail/dialog.py:384
 msgid "Request a feature"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:396 ayatanawebmail/dialog.py:399
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
 #, python-brace-format
 msgid "It's a good idea to add the {labelname} label to your issue."
 msgstr ""
 
-#: ayatanawebmail/dialog.py:397
+#: /ayatanawebmail/dialog.py:387
 msgid "Ask a question"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:400
+#: /ayatanawebmail/dialog.py:390
 msgid "Help translate"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:402
+#: /ayatanawebmail/dialog.py:392
 msgid "Source code"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:404
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:424
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+msgid "Enable notifications"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+msgid "Play sound when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+msgid "Hide message count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:5
-msgid "Display notifications about new mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+msgid "Run this command when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+msgid "Custom sound"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:5
-msgid "Webmail notifications and actions for any desktop"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+msgid "Play a custom sound when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:15
-msgid "Mark all as read"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+msgid "Merge messages"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:20
-msgid "Compose Mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+msgid "Merge messages belonging to the same conversation."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:25
-msgid "Sent"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+msgid "Message action"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:30
-msgid "Inbox"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+msgid "Action to perform when a message is activated."
 msgstr ""
diff --git a/po/af.po b/po/af.po
index 90b506f..9ef0123 100644
--- a/po/af.po
+++ b/po/af.po
@@ -6,9 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail 22.6.28\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/"
-"issues\n"
-"POT-Creation-Date: 2020-08-22 20:15+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -18,300 +17,329 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr ""
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr ""
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr ""
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:204
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr ""
 
-#: ayatanawebmail/application.py:211
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr ""
 
-#: ayatanawebmail/application.py:218
-#: data/usr/share/applications/ayatana-webmail.desktop:35
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr ""
 
-#: ayatanawebmail/application.py:957
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:1110
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr ""
 
-#: ayatanawebmail/application.py:1111
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
-msgid "Unable to connect to account \"{accountName}\", the application will now exit."
+msgid ""
+"Unable to connect to account \"{accountName}\", the application will now "
+"exit."
 msgstr ""
 
-#: ayatanawebmail/application.py:1136
+#: /ayatanawebmail/application.py:1131
 #, python-format
-msgid "You have %d unread mail"
-msgid_plural "You have %d unread mails"
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ayatanawebmail/application.py:1163
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr ""
 
-#: ayatanawebmail/application.py:1165
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1167
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1180
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:60
-msgid "If this string starts with http:// or https://, the application will open it in your browser - otherwise, it will be run as a command"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:61
+msgid ""
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:90 ayatanawebmail/dialog.py:104
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:132
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:140
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:141
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:142
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:143
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:204
-msgid "Please visit the following link and enable access for less secure apps:"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:206
-msgid "Access blocked by Google"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:210
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:211
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:234
-msgid "Custom"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:242
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:244
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:286
-msgid "The application will append this string to \"Inbox\" to access a specific message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+#: /ayatanawebmail/dialog.py:276
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:288
+#: /ayatanawebmail/dialog.py:278
 msgid "Account:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:290
+#: /ayatanawebmail/dialog.py:280
 msgid "Server:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:292
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:294
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:296
+#: /ayatanawebmail/dialog.py:286
 msgid "Username:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:298
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:300
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:302
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:296
 msgid "Sent:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:308
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:310
+#: /ayatanawebmail/dialog.py:300
 msgid "Message:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:346
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:347
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:348
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:358
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:360
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:362
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:364
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:369
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:376
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:392
+#: /ayatanawebmail/dialog.py:382
 msgid "Report a bug"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:394
+#: /ayatanawebmail/dialog.py:384
 msgid "Request a feature"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:396 ayatanawebmail/dialog.py:399
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
 #, python-brace-format
 msgid "It's a good idea to add the {labelname} label to your issue."
 msgstr ""
 
-#: ayatanawebmail/dialog.py:397
+#: /ayatanawebmail/dialog.py:387
 msgid "Ask a question"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:400
+#: /ayatanawebmail/dialog.py:390
 msgid "Help translate"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:402
+#: /ayatanawebmail/dialog.py:392
 msgid "Source code"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:404
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:424
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+msgid "Enable notifications"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+msgid "Play sound when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+msgid "Hide message count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:5
-msgid "Display notifications about new mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+msgid "Run this command when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+msgid "Custom sound"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:5
-msgid "Webmail notifications and actions for any desktop"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+msgid "Play a custom sound when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:15
-msgid "Mark all as read"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+msgid "Merge messages"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:20
-msgid "Compose Mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+msgid "Merge messages belonging to the same conversation."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:25
-msgid "Sent"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+msgid "Message action"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:30
-msgid "Inbox"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+msgid "Action to perform when a message is activated."
 msgstr ""
diff --git a/po/am.po b/po/am.po
index b4c0a52..a27475d 100644
--- a/po/am.po
+++ b/po/am.po
@@ -6,9 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail 22.6.28\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/"
-"issues\n"
-"POT-Creation-Date: 2020-08-22 20:15+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -18,300 +17,329 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr ""
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr ""
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr ""
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:204
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr ""
 
-#: ayatanawebmail/application.py:211
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr ""
 
-#: ayatanawebmail/application.py:218
-#: data/usr/share/applications/ayatana-webmail.desktop:35
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr ""
 
-#: ayatanawebmail/application.py:957
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:1110
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr ""
 
-#: ayatanawebmail/application.py:1111
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
-msgid "Unable to connect to account \"{accountName}\", the application will now exit."
+msgid ""
+"Unable to connect to account \"{accountName}\", the application will now "
+"exit."
 msgstr ""
 
-#: ayatanawebmail/application.py:1136
+#: /ayatanawebmail/application.py:1131
 #, python-format
-msgid "You have %d unread mail"
-msgid_plural "You have %d unread mails"
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ayatanawebmail/application.py:1163
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr ""
 
-#: ayatanawebmail/application.py:1165
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1167
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1180
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:60
-msgid "If this string starts with http:// or https://, the application will open it in your browser - otherwise, it will be run as a command"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:61
+msgid ""
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:90 ayatanawebmail/dialog.py:104
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:132
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:140
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:141
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:142
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:143
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:204
-msgid "Please visit the following link and enable access for less secure apps:"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:206
-msgid "Access blocked by Google"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:210
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:211
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:234
-msgid "Custom"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:242
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:244
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:286
-msgid "The application will append this string to \"Inbox\" to access a specific message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+#: /ayatanawebmail/dialog.py:276
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:288
+#: /ayatanawebmail/dialog.py:278
 msgid "Account:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:290
+#: /ayatanawebmail/dialog.py:280
 msgid "Server:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:292
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:294
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:296
+#: /ayatanawebmail/dialog.py:286
 msgid "Username:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:298
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:300
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:302
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:296
 msgid "Sent:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:308
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:310
+#: /ayatanawebmail/dialog.py:300
 msgid "Message:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:346
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:347
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:348
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:358
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:360
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:362
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:364
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:369
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:376
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:392
+#: /ayatanawebmail/dialog.py:382
 msgid "Report a bug"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:394
+#: /ayatanawebmail/dialog.py:384
 msgid "Request a feature"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:396 ayatanawebmail/dialog.py:399
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
 #, python-brace-format
 msgid "It's a good idea to add the {labelname} label to your issue."
 msgstr ""
 
-#: ayatanawebmail/dialog.py:397
+#: /ayatanawebmail/dialog.py:387
 msgid "Ask a question"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:400
+#: /ayatanawebmail/dialog.py:390
 msgid "Help translate"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:402
+#: /ayatanawebmail/dialog.py:392
 msgid "Source code"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:404
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:424
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+msgid "Enable notifications"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+msgid "Play sound when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+msgid "Hide message count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:5
-msgid "Display notifications about new mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+msgid "Run this command when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+msgid "Custom sound"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:5
-msgid "Webmail notifications and actions for any desktop"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+msgid "Play a custom sound when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:15
-msgid "Mark all as read"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+msgid "Merge messages"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:20
-msgid "Compose Mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+msgid "Merge messages belonging to the same conversation."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:25
-msgid "Sent"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+msgid "Message action"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:30
-msgid "Inbox"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+msgid "Action to perform when a message is activated."
 msgstr ""
diff --git a/po/an.po b/po/an.po
index 6159724..15db3ee 100644
--- a/po/an.po
+++ b/po/an.po
@@ -6,9 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail 22.6.28\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/"
-"issues\n"
-"POT-Creation-Date: 2020-08-22 20:15+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -18,300 +17,329 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr ""
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr ""
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr ""
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:204
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr ""
 
-#: ayatanawebmail/application.py:211
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr ""
 
-#: ayatanawebmail/application.py:218
-#: data/usr/share/applications/ayatana-webmail.desktop:35
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr ""
 
-#: ayatanawebmail/application.py:957
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:1110
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr ""
 
-#: ayatanawebmail/application.py:1111
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
-msgid "Unable to connect to account \"{accountName}\", the application will now exit."
+msgid ""
+"Unable to connect to account \"{accountName}\", the application will now "
+"exit."
 msgstr ""
 
-#: ayatanawebmail/application.py:1136
+#: /ayatanawebmail/application.py:1131
 #, python-format
-msgid "You have %d unread mail"
-msgid_plural "You have %d unread mails"
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ayatanawebmail/application.py:1163
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr ""
 
-#: ayatanawebmail/application.py:1165
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1167
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1180
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:60
-msgid "If this string starts with http:// or https://, the application will open it in your browser - otherwise, it will be run as a command"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:61
+msgid ""
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:90 ayatanawebmail/dialog.py:104
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:132
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:140
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:141
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:142
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:143
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:204
-msgid "Please visit the following link and enable access for less secure apps:"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:206
-msgid "Access blocked by Google"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:210
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:211
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:234
-msgid "Custom"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:242
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:244
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:286
-msgid "The application will append this string to \"Inbox\" to access a specific message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+#: /ayatanawebmail/dialog.py:276
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:288
+#: /ayatanawebmail/dialog.py:278
 msgid "Account:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:290
+#: /ayatanawebmail/dialog.py:280
 msgid "Server:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:292
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:294
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:296
+#: /ayatanawebmail/dialog.py:286
 msgid "Username:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:298
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:300
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:302
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:296
 msgid "Sent:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:308
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:310
+#: /ayatanawebmail/dialog.py:300
 msgid "Message:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:346
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:347
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:348
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:358
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:360
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:362
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:364
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:369
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:376
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:392
+#: /ayatanawebmail/dialog.py:382
 msgid "Report a bug"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:394
+#: /ayatanawebmail/dialog.py:384
 msgid "Request a feature"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:396 ayatanawebmail/dialog.py:399
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
 #, python-brace-format
 msgid "It's a good idea to add the {labelname} label to your issue."
 msgstr ""
 
-#: ayatanawebmail/dialog.py:397
+#: /ayatanawebmail/dialog.py:387
 msgid "Ask a question"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:400
+#: /ayatanawebmail/dialog.py:390
 msgid "Help translate"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:402
+#: /ayatanawebmail/dialog.py:392
 msgid "Source code"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:404
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:424
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+msgid "Enable notifications"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+msgid "Play sound when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+msgid "Hide message count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:5
-msgid "Display notifications about new mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+msgid "Run this command when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+msgid "Custom sound"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:5
-msgid "Webmail notifications and actions for any desktop"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+msgid "Play a custom sound when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:15
-msgid "Mark all as read"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+msgid "Merge messages"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:20
-msgid "Compose Mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+msgid "Merge messages belonging to the same conversation."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:25
-msgid "Sent"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+msgid "Message action"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:30
-msgid "Inbox"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+msgid "Action to perform when a message is activated."
 msgstr ""
diff --git a/po/ar.po b/po/ar.po
index 5db33d2..88e1169 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -6,9 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail 22.6.28\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/"
-"issues\n"
-"POT-Creation-Date: 2020-08-22 20:15+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -19,68 +18,69 @@ msgstr ""
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
 "&& n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr ""
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr ""
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr ""
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:204
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr ""
 
-#: ayatanawebmail/application.py:211
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr ""
 
-#: ayatanawebmail/application.py:218
-#: data/usr/share/applications/ayatana-webmail.desktop:35
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr ""
 
-#: ayatanawebmail/application.py:957
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:1110
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr ""
 
-#: ayatanawebmail/application.py:1111
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
-msgid "Unable to connect to account \"{accountName}\", the application will now exit."
+msgid ""
+"Unable to connect to account \"{accountName}\", the application will now "
+"exit."
 msgstr ""
 
-#: ayatanawebmail/application.py:1136
+#: /ayatanawebmail/application.py:1131
 #, python-format
-msgid "You have %d unread mail"
-msgid_plural "You have %d unread mails"
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
@@ -88,235 +88,263 @@ msgstr[3] ""
 msgstr[4] ""
 msgstr[5] ""
 
-#: ayatanawebmail/application.py:1163
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr ""
 
-#: ayatanawebmail/application.py:1165
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1167
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1180
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:60
-msgid "If this string starts with http:// or https://, the application will open it in your browser - otherwise, it will be run as a command"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:61
+msgid ""
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:90 ayatanawebmail/dialog.py:104
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:132
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:140
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:141
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:142
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:143
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:204
-msgid "Please visit the following link and enable access for less secure apps:"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:206
-msgid "Access blocked by Google"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:210
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:211
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:234
-msgid "Custom"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:242
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:244
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:286
-msgid "The application will append this string to \"Inbox\" to access a specific message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+#: /ayatanawebmail/dialog.py:276
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:288
+#: /ayatanawebmail/dialog.py:278
 msgid "Account:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:290
+#: /ayatanawebmail/dialog.py:280
 msgid "Server:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:292
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:294
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:296
+#: /ayatanawebmail/dialog.py:286
 msgid "Username:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:298
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:300
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:302
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:296
 msgid "Sent:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:308
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:310
+#: /ayatanawebmail/dialog.py:300
 msgid "Message:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:346
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:347
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:348
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:358
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:360
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:362
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:364
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:369
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:376
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:392
+#: /ayatanawebmail/dialog.py:382
 msgid "Report a bug"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:394
+#: /ayatanawebmail/dialog.py:384
 msgid "Request a feature"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:396 ayatanawebmail/dialog.py:399
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
 #, python-brace-format
 msgid "It's a good idea to add the {labelname} label to your issue."
 msgstr ""
 
-#: ayatanawebmail/dialog.py:397
+#: /ayatanawebmail/dialog.py:387
 msgid "Ask a question"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:400
+#: /ayatanawebmail/dialog.py:390
 msgid "Help translate"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:402
+#: /ayatanawebmail/dialog.py:392
 msgid "Source code"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:404
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:424
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+msgid "Enable notifications"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+msgid "Play sound when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+msgid "Hide message count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:5
-msgid "Display notifications about new mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+msgid "Run this command when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+msgid "Custom sound"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:5
-msgid "Webmail notifications and actions for any desktop"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+msgid "Play a custom sound when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:15
-msgid "Mark all as read"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+msgid "Merge messages"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:20
-msgid "Compose Mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+msgid "Merge messages belonging to the same conversation."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:25
-msgid "Sent"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+msgid "Message action"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:30
-msgid "Inbox"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+msgid "Action to perform when a message is activated."
 msgstr ""
diff --git a/po/as.po b/po/as.po
index 2e0a700..28cad13 100644
--- a/po/as.po
+++ b/po/as.po
@@ -6,9 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail 22.6.28\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/"
-"issues\n"
-"POT-Creation-Date: 2020-08-22 20:15+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -18,300 +17,329 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr ""
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr ""
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr ""
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:204
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr ""
 
-#: ayatanawebmail/application.py:211
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr ""
 
-#: ayatanawebmail/application.py:218
-#: data/usr/share/applications/ayatana-webmail.desktop:35
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr ""
 
-#: ayatanawebmail/application.py:957
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:1110
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr ""
 
-#: ayatanawebmail/application.py:1111
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
-msgid "Unable to connect to account \"{accountName}\", the application will now exit."
+msgid ""
+"Unable to connect to account \"{accountName}\", the application will now "
+"exit."
 msgstr ""
 
-#: ayatanawebmail/application.py:1136
+#: /ayatanawebmail/application.py:1131
 #, python-format
-msgid "You have %d unread mail"
-msgid_plural "You have %d unread mails"
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ayatanawebmail/application.py:1163
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr ""
 
-#: ayatanawebmail/application.py:1165
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1167
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1180
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:60
-msgid "If this string starts with http:// or https://, the application will open it in your browser - otherwise, it will be run as a command"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:61
+msgid ""
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:90 ayatanawebmail/dialog.py:104
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:132
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:140
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:141
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:142
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:143
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:204
-msgid "Please visit the following link and enable access for less secure apps:"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:206
-msgid "Access blocked by Google"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:210
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:211
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:234
-msgid "Custom"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:242
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:244
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:286
-msgid "The application will append this string to \"Inbox\" to access a specific message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+#: /ayatanawebmail/dialog.py:276
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:288
+#: /ayatanawebmail/dialog.py:278
 msgid "Account:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:290
+#: /ayatanawebmail/dialog.py:280
 msgid "Server:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:292
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:294
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:296
+#: /ayatanawebmail/dialog.py:286
 msgid "Username:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:298
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:300
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:302
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:296
 msgid "Sent:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:308
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:310
+#: /ayatanawebmail/dialog.py:300
 msgid "Message:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:346
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:347
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:348
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:358
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:360
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:362
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:364
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:369
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:376
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:392
+#: /ayatanawebmail/dialog.py:382
 msgid "Report a bug"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:394
+#: /ayatanawebmail/dialog.py:384
 msgid "Request a feature"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:396 ayatanawebmail/dialog.py:399
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
 #, python-brace-format
 msgid "It's a good idea to add the {labelname} label to your issue."
 msgstr ""
 
-#: ayatanawebmail/dialog.py:397
+#: /ayatanawebmail/dialog.py:387
 msgid "Ask a question"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:400
+#: /ayatanawebmail/dialog.py:390
 msgid "Help translate"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:402
+#: /ayatanawebmail/dialog.py:392
 msgid "Source code"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:404
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:424
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+msgid "Enable notifications"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+msgid "Play sound when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+msgid "Hide message count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:5
-msgid "Display notifications about new mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+msgid "Run this command when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+msgid "Custom sound"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:5
-msgid "Webmail notifications and actions for any desktop"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+msgid "Play a custom sound when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:15
-msgid "Mark all as read"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+msgid "Merge messages"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:20
-msgid "Compose Mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+msgid "Merge messages belonging to the same conversation."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:25
-msgid "Sent"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+msgid "Message action"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:30
-msgid "Inbox"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+msgid "Action to perform when a message is activated."
 msgstr ""
diff --git a/po/ast.po b/po/ast.po
index e3a5e03..9013edd 100644
--- a/po/ast.po
+++ b/po/ast.po
@@ -6,9 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail 22.6.28\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/"
-"issues\n"
-"POT-Creation-Date: 2020-08-22 20:15+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -18,300 +17,329 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr ""
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr ""
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr ""
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:204
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr ""
 
-#: ayatanawebmail/application.py:211
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr ""
 
-#: ayatanawebmail/application.py:218
-#: data/usr/share/applications/ayatana-webmail.desktop:35
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr ""
 
-#: ayatanawebmail/application.py:957
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:1110
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr ""
 
-#: ayatanawebmail/application.py:1111
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
-msgid "Unable to connect to account \"{accountName}\", the application will now exit."
+msgid ""
+"Unable to connect to account \"{accountName}\", the application will now "
+"exit."
 msgstr ""
 
-#: ayatanawebmail/application.py:1136
+#: /ayatanawebmail/application.py:1131
 #, python-format
-msgid "You have %d unread mail"
-msgid_plural "You have %d unread mails"
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ayatanawebmail/application.py:1163
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr ""
 
-#: ayatanawebmail/application.py:1165
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1167
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1180
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:60
-msgid "If this string starts with http:// or https://, the application will open it in your browser - otherwise, it will be run as a command"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:61
+msgid ""
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:90 ayatanawebmail/dialog.py:104
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:132
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:140
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:141
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:142
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:143
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:204
-msgid "Please visit the following link and enable access for less secure apps:"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:206
-msgid "Access blocked by Google"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:210
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:211
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:234
-msgid "Custom"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:242
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:244
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:286
-msgid "The application will append this string to \"Inbox\" to access a specific message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+#: /ayatanawebmail/dialog.py:276
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:288
+#: /ayatanawebmail/dialog.py:278
 msgid "Account:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:290
+#: /ayatanawebmail/dialog.py:280
 msgid "Server:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:292
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:294
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:296
+#: /ayatanawebmail/dialog.py:286
 msgid "Username:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:298
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:300
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:302
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:296
 msgid "Sent:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:308
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:310
+#: /ayatanawebmail/dialog.py:300
 msgid "Message:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:346
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:347
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:348
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:358
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:360
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:362
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:364
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:369
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:376
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:392
+#: /ayatanawebmail/dialog.py:382
 msgid "Report a bug"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:394
+#: /ayatanawebmail/dialog.py:384
 msgid "Request a feature"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:396 ayatanawebmail/dialog.py:399
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
 #, python-brace-format
 msgid "It's a good idea to add the {labelname} label to your issue."
 msgstr ""
 
-#: ayatanawebmail/dialog.py:397
+#: /ayatanawebmail/dialog.py:387
 msgid "Ask a question"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:400
+#: /ayatanawebmail/dialog.py:390
 msgid "Help translate"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:402
+#: /ayatanawebmail/dialog.py:392
 msgid "Source code"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:404
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:424
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+msgid "Enable notifications"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+msgid "Play sound when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+msgid "Hide message count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:5
-msgid "Display notifications about new mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+msgid "Run this command when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+msgid "Custom sound"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:5
-msgid "Webmail notifications and actions for any desktop"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+msgid "Play a custom sound when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:15
-msgid "Mark all as read"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+msgid "Merge messages"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:20
-msgid "Compose Mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+msgid "Merge messages belonging to the same conversation."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:25
-msgid "Sent"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+msgid "Message action"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:30
-msgid "Inbox"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+msgid "Action to perform when a message is activated."
 msgstr ""
diff --git a/po/ayatanawebmail.pot b/po/ayatanawebmail.pot
index 339a06a..9075594 100755..100644
--- a/po/ayatanawebmail.pot
+++ b/po/ayatanawebmail.pot
@@ -1,20 +1,20 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Robert Tari
-# This file is distributed under the same license as the ayatana-webmail package.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: ayatana-webmail 22.6.28\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/issues\n"
-"POT-Creation-Date: 2021-01-03 14:41+0100\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:51+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"
 "Language: \n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
@@ -50,268 +50,297 @@ msgstr ""
 msgid "Subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:204
+#: ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr ""
 
-#: ayatanawebmail/application.py:211
+#: ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr ""
 
-#: ayatanawebmail/application.py:218
-#: data/usr/share/applications/ayatana-webmail.desktop:35
+#: ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr ""
 
-#: ayatanawebmail/application.py:957
+#: ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:1110
+#: ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr ""
 
-#: ayatanawebmail/application.py:1111
+#: ayatanawebmail/application.py:1106
 #, python-brace-format
-msgid "Unable to connect to account \"{accountName}\", the application will now exit."
+msgid ""
+"Unable to connect to account \"{accountName}\", the application will now "
+"exit."
 msgstr ""
 
-#: ayatanawebmail/application.py:1136
+#: ayatanawebmail/application.py:1131
 #, python-format
 msgid "You have %d unread message"
 msgid_plural "You have %d unread messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ayatanawebmail/application.py:1163
+#: ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr ""
 
-#: ayatanawebmail/application.py:1165
+#: ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1167
+#: ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1180
+#: ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:60
-msgid "If this string starts with http:// or https://, the application will open it in your browser - otherwise, it will be run as a command"
+#: ayatanawebmail/dialog.py:17
+msgid "Custom"
+msgstr ""
+
+#: ayatanawebmail/dialog.py:61
+msgid ""
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:90 ayatanawebmail/dialog.py:104
+#: ayatanawebmail/dialog.py:91 ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:132
+#: ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:140
+#: ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:141
+#: ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:142
+#: ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:143
+#: ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:204
-msgid "Please visit the following link and enable access for less secure apps:"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:206
-msgid "Access blocked by Google"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:210
+#: ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:211
+#: ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:234
-msgid "Custom"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:242
+#: ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:244
+#: ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:286
-msgid "The application will append this string to \"Inbox\" to access a specific message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+#: ayatanawebmail/dialog.py:276
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:288
+#: ayatanawebmail/dialog.py:278
 msgid "Account:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:290
+#: ayatanawebmail/dialog.py:280
 msgid "Server:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:292
+#: ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:294
+#: ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:296
+#: ayatanawebmail/dialog.py:286
 msgid "Username:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:298
+#: ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:300
+#: ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:302
+#: ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:304
+#: ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:306
+#: ayatanawebmail/dialog.py:296
 msgid "Sent:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:308
+#: ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:310
+#: ayatanawebmail/dialog.py:300
 msgid "Message:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:346
+#: ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:347
+#: ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:348
+#: ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:358
+#: ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:360
+#: ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:362
+#: ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:364
+#: ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:366
+#: ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:369
+#: ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:376
+#: ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:392
+#: ayatanawebmail/dialog.py:382
 msgid "Report a bug"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:394
+#: ayatanawebmail/dialog.py:384
 msgid "Request a feature"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:396 ayatanawebmail/dialog.py:399
+#: ayatanawebmail/dialog.py:386 ayatanawebmail/dialog.py:389
 #, python-brace-format
 msgid "It's a good idea to add the {labelname} label to your issue."
 msgstr ""
 
-#: ayatanawebmail/dialog.py:397
+#: ayatanawebmail/dialog.py:387
 msgid "Ask a question"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:400
+#: ayatanawebmail/dialog.py:390
 msgid "Help translate"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:402
+#: ayatanawebmail/dialog.py:392
 msgid "Source code"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:404
+#: ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:424
+#: ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
+#: data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
+msgstr ""
+
+#: data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+msgid "Enable notifications"
+msgstr ""
+
+#: data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
+
+#: data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
+
+#: data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+msgid "Play sound when new messages arrive."
+msgstr ""
+
+#: data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+msgid "Hide message count"
+msgstr ""
+
+#: data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
+
+#: data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:5
-msgid "Display notifications about new mail"
+#: data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+msgid "Run this command when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
+#: data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+msgid "Custom sound"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:5
-msgid "Webmail notifications and actions for any desktop"
+#: data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+msgid "Play a custom sound when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:15
-msgid "Mark all as read"
+#: data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+msgid "Merge messages"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:20
-msgid "Compose Mail"
+#: data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+msgid "Merge messages belonging to the same conversation."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:25
-msgid "Sent"
+#: data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+msgid "Message action"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:30
-msgid "Inbox"
+#: data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+msgid "Action to perform when a message is activated."
 msgstr ""
diff --git a/po/az.po b/po/az.po
index 8f0d86c..ae89afc 100644
--- a/po/az.po
+++ b/po/az.po
@@ -6,9 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail 22.6.28\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/"
-"issues\n"
-"POT-Creation-Date: 2020-08-22 20:15+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -18,300 +17,329 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr ""
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr ""
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr ""
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:204
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr ""
 
-#: ayatanawebmail/application.py:211
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr ""
 
-#: ayatanawebmail/application.py:218
-#: data/usr/share/applications/ayatana-webmail.desktop:35
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr ""
 
-#: ayatanawebmail/application.py:957
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:1110
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr ""
 
-#: ayatanawebmail/application.py:1111
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
-msgid "Unable to connect to account \"{accountName}\", the application will now exit."
+msgid ""
+"Unable to connect to account \"{accountName}\", the application will now "
+"exit."
 msgstr ""
 
-#: ayatanawebmail/application.py:1136
+#: /ayatanawebmail/application.py:1131
 #, python-format
-msgid "You have %d unread mail"
-msgid_plural "You have %d unread mails"
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ayatanawebmail/application.py:1163
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr ""
 
-#: ayatanawebmail/application.py:1165
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1167
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1180
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:60
-msgid "If this string starts with http:// or https://, the application will open it in your browser - otherwise, it will be run as a command"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:61
+msgid ""
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:90 ayatanawebmail/dialog.py:104
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:132
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:140
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:141
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:142
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:143
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:204
-msgid "Please visit the following link and enable access for less secure apps:"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:206
-msgid "Access blocked by Google"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:210
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:211
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:234
-msgid "Custom"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:242
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:244
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:286
-msgid "The application will append this string to \"Inbox\" to access a specific message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+#: /ayatanawebmail/dialog.py:276
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:288
+#: /ayatanawebmail/dialog.py:278
 msgid "Account:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:290
+#: /ayatanawebmail/dialog.py:280
 msgid "Server:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:292
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:294
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:296
+#: /ayatanawebmail/dialog.py:286
 msgid "Username:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:298
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:300
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:302
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:296
 msgid "Sent:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:308
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:310
+#: /ayatanawebmail/dialog.py:300
 msgid "Message:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:346
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:347
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:348
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:358
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:360
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:362
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:364
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:369
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:376
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:392
+#: /ayatanawebmail/dialog.py:382
 msgid "Report a bug"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:394
+#: /ayatanawebmail/dialog.py:384
 msgid "Request a feature"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:396 ayatanawebmail/dialog.py:399
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
 #, python-brace-format
 msgid "It's a good idea to add the {labelname} label to your issue."
 msgstr ""
 
-#: ayatanawebmail/dialog.py:397
+#: /ayatanawebmail/dialog.py:387
 msgid "Ask a question"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:400
+#: /ayatanawebmail/dialog.py:390
 msgid "Help translate"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:402
+#: /ayatanawebmail/dialog.py:392
 msgid "Source code"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:404
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:424
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+msgid "Enable notifications"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+msgid "Play sound when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+msgid "Hide message count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:5
-msgid "Display notifications about new mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+msgid "Run this command when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+msgid "Custom sound"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:5
-msgid "Webmail notifications and actions for any desktop"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+msgid "Play a custom sound when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:15
-msgid "Mark all as read"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+msgid "Merge messages"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:20
-msgid "Compose Mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+msgid "Merge messages belonging to the same conversation."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:25
-msgid "Sent"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+msgid "Message action"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:30
-msgid "Inbox"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+msgid "Action to perform when a message is activated."
 msgstr ""
diff --git a/po/be.po b/po/be.po
index e4015b0..6cd272d 100644
--- a/po/be.po
+++ b/po/be.po
@@ -6,9 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail 22.6.28\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/"
-"issues\n"
-"POT-Creation-Date: 2020-08-22 20:15+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -19,301 +18,330 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr ""
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr ""
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr ""
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:204
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr ""
 
-#: ayatanawebmail/application.py:211
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr ""
 
-#: ayatanawebmail/application.py:218
-#: data/usr/share/applications/ayatana-webmail.desktop:35
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr ""
 
-#: ayatanawebmail/application.py:957
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:1110
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr ""
 
-#: ayatanawebmail/application.py:1111
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
-msgid "Unable to connect to account \"{accountName}\", the application will now exit."
+msgid ""
+"Unable to connect to account \"{accountName}\", the application will now "
+"exit."
 msgstr ""
 
-#: ayatanawebmail/application.py:1136
+#: /ayatanawebmail/application.py:1131
 #, python-format
-msgid "You have %d unread mail"
-msgid_plural "You have %d unread mails"
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: ayatanawebmail/application.py:1163
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr ""
 
-#: ayatanawebmail/application.py:1165
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1167
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1180
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:60
-msgid "If this string starts with http:// or https://, the application will open it in your browser - otherwise, it will be run as a command"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:61
+msgid ""
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:90 ayatanawebmail/dialog.py:104
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:132
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:140
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:141
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:142
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:143
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:204
-msgid "Please visit the following link and enable access for less secure apps:"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:206
-msgid "Access blocked by Google"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:210
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:211
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:234
-msgid "Custom"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:242
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:244
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:286
-msgid "The application will append this string to \"Inbox\" to access a specific message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+#: /ayatanawebmail/dialog.py:276
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:288
+#: /ayatanawebmail/dialog.py:278
 msgid "Account:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:290
+#: /ayatanawebmail/dialog.py:280
 msgid "Server:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:292
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:294
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:296
+#: /ayatanawebmail/dialog.py:286
 msgid "Username:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:298
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:300
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:302
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:296
 msgid "Sent:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:308
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:310
+#: /ayatanawebmail/dialog.py:300
 msgid "Message:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:346
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:347
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:348
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:358
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:360
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:362
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:364
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:369
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:376
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:392
+#: /ayatanawebmail/dialog.py:382
 msgid "Report a bug"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:394
+#: /ayatanawebmail/dialog.py:384
 msgid "Request a feature"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:396 ayatanawebmail/dialog.py:399
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
 #, python-brace-format
 msgid "It's a good idea to add the {labelname} label to your issue."
 msgstr ""
 
-#: ayatanawebmail/dialog.py:397
+#: /ayatanawebmail/dialog.py:387
 msgid "Ask a question"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:400
+#: /ayatanawebmail/dialog.py:390
 msgid "Help translate"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:402
+#: /ayatanawebmail/dialog.py:392
 msgid "Source code"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:404
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:424
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+msgid "Enable notifications"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+msgid "Play sound when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+msgid "Hide message count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:5
-msgid "Display notifications about new mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+msgid "Run this command when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+msgid "Custom sound"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:5
-msgid "Webmail notifications and actions for any desktop"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+msgid "Play a custom sound when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:15
-msgid "Mark all as read"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+msgid "Merge messages"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:20
-msgid "Compose Mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+msgid "Merge messages belonging to the same conversation."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:25
-msgid "Sent"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+msgid "Message action"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:30
-msgid "Inbox"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+msgid "Action to perform when a message is activated."
 msgstr ""
diff --git a/po/bem.po b/po/bem.po
index 5e3d990..6388613 100644
--- a/po/bem.po
+++ b/po/bem.po
@@ -6,9 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail 22.6.28\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/"
-"issues\n"
-"POT-Creation-Date: 2020-08-22 20:15+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -18,300 +17,329 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr ""
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr ""
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr ""
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:204
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr ""
 
-#: ayatanawebmail/application.py:211
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr ""
 
-#: ayatanawebmail/application.py:218
-#: data/usr/share/applications/ayatana-webmail.desktop:35
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr ""
 
-#: ayatanawebmail/application.py:957
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:1110
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr ""
 
-#: ayatanawebmail/application.py:1111
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
-msgid "Unable to connect to account \"{accountName}\", the application will now exit."
+msgid ""
+"Unable to connect to account \"{accountName}\", the application will now "
+"exit."
 msgstr ""
 
-#: ayatanawebmail/application.py:1136
+#: /ayatanawebmail/application.py:1131
 #, python-format
-msgid "You have %d unread mail"
-msgid_plural "You have %d unread mails"
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ayatanawebmail/application.py:1163
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr ""
 
-#: ayatanawebmail/application.py:1165
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1167
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1180
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:60
-msgid "If this string starts with http:// or https://, the application will open it in your browser - otherwise, it will be run as a command"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:61
+msgid ""
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:90 ayatanawebmail/dialog.py:104
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:132
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:140
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:141
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:142
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:143
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:204
-msgid "Please visit the following link and enable access for less secure apps:"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:206
-msgid "Access blocked by Google"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:210
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:211
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:234
-msgid "Custom"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:242
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:244
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:286
-msgid "The application will append this string to \"Inbox\" to access a specific message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+#: /ayatanawebmail/dialog.py:276
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:288
+#: /ayatanawebmail/dialog.py:278
 msgid "Account:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:290
+#: /ayatanawebmail/dialog.py:280
 msgid "Server:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:292
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:294
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:296
+#: /ayatanawebmail/dialog.py:286
 msgid "Username:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:298
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:300
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:302
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:296
 msgid "Sent:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:308
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:310
+#: /ayatanawebmail/dialog.py:300
 msgid "Message:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:346
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:347
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:348
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:358
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:360
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:362
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:364
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:369
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:376
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:392
+#: /ayatanawebmail/dialog.py:382
 msgid "Report a bug"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:394
+#: /ayatanawebmail/dialog.py:384
 msgid "Request a feature"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:396 ayatanawebmail/dialog.py:399
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
 #, python-brace-format
 msgid "It's a good idea to add the {labelname} label to your issue."
 msgstr ""
 
-#: ayatanawebmail/dialog.py:397
+#: /ayatanawebmail/dialog.py:387
 msgid "Ask a question"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:400
+#: /ayatanawebmail/dialog.py:390
 msgid "Help translate"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:402
+#: /ayatanawebmail/dialog.py:392
 msgid "Source code"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:404
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:424
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+msgid "Enable notifications"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+msgid "Play sound when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+msgid "Hide message count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:5
-msgid "Display notifications about new mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+msgid "Run this command when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+msgid "Custom sound"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:5
-msgid "Webmail notifications and actions for any desktop"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+msgid "Play a custom sound when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:15
-msgid "Mark all as read"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+msgid "Merge messages"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:20
-msgid "Compose Mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+msgid "Merge messages belonging to the same conversation."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:25
-msgid "Sent"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+msgid "Message action"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:30
-msgid "Inbox"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+msgid "Action to perform when a message is activated."
 msgstr ""
diff --git a/po/bg.po b/po/bg.po
index 24c7136..cde9df7 100755
--- a/po/bg.po
+++ b/po/bg.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/issues\n"
-"POT-Creation-Date: 2020-04-03 12:21+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: 2018-06-04 07:34+0000\n"
 "Language-Team: Bulgarian <bg@li.org>\n"
+"Language: bg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -17,312 +18,359 @@ msgstr ""
 "X-Launchpad-Export-Date: 2020-04-04 05:58+0000\n"
 "X-Generator: Launchpad (build a296f04231dee355be5db73cc878b9e21689a253)\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr ""
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr ""
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr ""
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:205
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr ""
 
-#: ayatanawebmail/application.py:212
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr ""
 
-#: ayatanawebmail/application.py:219
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr ""
 
-#: ayatanawebmail/application.py:980
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr "Без тема"
 
-#: ayatanawebmail/application.py:1132
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr ""
 
-#: ayatanawebmail/application.py:1133
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
 msgid ""
 "Unable to connect to account \"{accountName}\", the application will now "
 "exit."
 msgstr ""
 
-#: ayatanawebmail/application.py:1133
-#, python-brace-format
-msgid "You can run \"{command}\" to delete all your login settings."
-msgstr ""
-
-#: ayatanawebmail/application.py:1158
-#, python-format
-msgid "You have %d unread mail"
-msgid_plural "You have %d unread mails"
+#: /ayatanawebmail/application.py:1131
+#, fuzzy, python-format
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
 msgstr[0] "Има %d непрочетено писмо"
 msgstr[1] "Има %d непрочетени писма"
 
-#: ayatanawebmail/application.py:1185
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr "от %(t0)s, %(t1)s и други"
 
-#: ayatanawebmail/application.py:1187
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr "от %(t0)s и %(t1)s"
 
-#: ayatanawebmail/application.py:1189
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr "от %s"
 
-#: ayatanawebmail/application.py:1202
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr "Ново писмо от %s"
 
-#: ayatanawebmail/dialog.py:60
-msgid "Web page"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:61
-msgid "Command"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:93
+#: /ayatanawebmail/dialog.py:61
 msgid ""
-"Append an additional string - you can use the $MSG_THREAD and $MSG_UID "
-"placeholders."
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:114 ayatanawebmail/dialog.py:128
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:156
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr "Настройки на Ayatana Webmail"
 
-#: ayatanawebmail/dialog.py:164
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr "Акаунти"
 
-#: ayatanawebmail/dialog.py:165
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr "Опции"
 
-#: ayatanawebmail/dialog.py:166
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:167
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:228
-msgid ""
-"Please visit the following link and enable access for less secure apps:"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:230
-msgid "Access blocked by Google"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:234
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:235
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:254
-msgid "Choose an account"
-msgstr "Избор на акаунт"
-
-#: ayatanawebmail/dialog.py:259
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:261
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:276
-msgid "Server data"
-msgstr "Данни за сървъра"
+#: /ayatanawebmail/dialog.py:276
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+msgstr ""
 
-#: ayatanawebmail/dialog.py:278
-msgid "Account data"
-msgstr "Данни за регистрацията"
+#: /ayatanawebmail/dialog.py:278
+#, fuzzy
+msgid "Account:"
+msgstr "Акаунти"
 
-#: ayatanawebmail/dialog.py:289
-msgid "Links"
-msgstr ""
+#: /ayatanawebmail/dialog.py:280
+#, fuzzy
+msgid "Server:"
+msgstr "Данни за сървъра"
 
-#: ayatanawebmail/dialog.py:297
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr "Хост:"
 
-#: ayatanawebmail/dialog.py:299
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr "Порт:"
 
-#: ayatanawebmail/dialog.py:302
-msgid "Login:"
-msgstr "Потребител:"
+#: /ayatanawebmail/dialog.py:286
+msgid "Username:"
+msgstr ""
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr "Парола:"
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:309
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr "Домашен:"
 
-#: ayatanawebmail/dialog.py:311
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr "Състави:"
 
-#: ayatanawebmail/dialog.py:313
+#: /ayatanawebmail/dialog.py:296
+msgid "Sent:"
+msgstr "Изпратени:"
+
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr "Входящи:"
 
-#: ayatanawebmail/dialog.py:316
-msgid "Sent:"
-msgstr "Изпратени:"
+#: /ayatanawebmail/dialog.py:300
+msgid "Message:"
+msgstr ""
 
-#: ayatanawebmail/dialog.py:354
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:355
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:356
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr "Вклчване на известявания"
 
-#: ayatanawebmail/dialog.py:368
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:370
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:372
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:374
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:377
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:384
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:400
-msgid "Report a bug/Request a feature"
+#: /ayatanawebmail/dialog.py:382
+msgid "Report a bug"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:402
-msgid "Ask a question"
+#: /ayatanawebmail/dialog.py:384
+msgid "Request a feature"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:404
-msgid "Help translate"
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
+#, python-brace-format
+msgid "It's a good idea to add the {labelname} label to your issue."
 msgstr ""
 
-#: ayatanawebmail/dialog.py:406
-msgid "Project page"
+#: /ayatanawebmail/dialog.py:387
+msgid "Ask a question"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:408
-msgid "Source code"
+#: /ayatanawebmail/dialog.py:390
+msgid "Help translate"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:410
-msgid "Repository"
+#: /ayatanawebmail/dialog.py:392
+msgid "Source code"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:412
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:426
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
-msgstr "Известяване за поща"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+#, fuzzy
+msgid "Enable notifications"
+msgstr "Вклчване на известявания"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+msgid "Play sound when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+msgid "Hide message count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:39
-msgid "Webmail notifications and actions for any desktop"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:74
-msgid "Mark all as read"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+msgid "Run this command when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:112
-msgid "Compose Mail"
-msgstr "Напиши писмо"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+msgid "Custom sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+msgid "Play a custom sound when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+msgid "Merge messages"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+msgid "Merge messages belonging to the same conversation."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+msgid "Message action"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+msgid "Action to perform when a message is activated."
+msgstr ""
+
+#~ msgid "Choose an account"
+#~ msgstr "Избор на акаунт"
+
+#~ msgid "Account data"
+#~ msgstr "Данни за регистрацията"
+
+#~ msgid "Login:"
+#~ msgstr "Потребител:"
+
+#~ msgid "Ayatana Webmail"
+#~ msgstr "Известяване за поща"
+
+#~ msgid "Compose Mail"
+#~ msgstr "Напиши писмо"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:152
-msgid "Sent"
-msgstr "Изпратени"
+#~ msgid "Sent"
+#~ msgstr "Изпратени"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:228
-msgid "Inbox"
-msgstr "Входящи"
+#~ msgid "Inbox"
+#~ msgstr "Входящи"
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
-msgstr "Ayatana Webmail (услуга)"
+#~ msgid "Ayatana Webmail (service)"
+#~ msgstr "Ayatana Webmail (услуга)"
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:38
-msgid "Display notifications about new mail"
-msgstr "Покажи известия при ново писмо"
+#~ msgid "Display notifications about new mail"
+#~ msgstr "Покажи известия при ново писмо"
diff --git a/po/bn.po b/po/bn.po
index 9456d37..10fe42d 100644
--- a/po/bn.po
+++ b/po/bn.po
@@ -6,13 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail 22.6.28\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/"
-"issues\n"
-"POT-Creation-Date: 2020-08-22 20:15+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: 2020-10-11 16:26+0000\n"
 "Last-Translator: Yota321 <golamsayan@gmail.com>\n"
-"Language-Team: Bengali <https://hosted.weblate.org/projects/"
-"ayatana-indicators/ayatana-webmail/bn/>\n"
+"Language-Team: Bengali <https://hosted.weblate.org/projects/ayatana-"
+"indicators/ayatana-webmail/bn/>\n"
 "Language: bn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,300 +19,331 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 "X-Generator: Weblate 4.3-dev\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr "নির্বাচন অ্যাকাউন্ট"
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr "আপনি কোন অ্যাকাউন্টের আদেশ / ওয়েব পৃষ্ঠা খুলতে চান?"
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr "বার্তা ক্রিয়া"
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr ""
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr ""
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:204
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr ""
 
-#: ayatanawebmail/application.py:211
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr ""
 
-#: ayatanawebmail/application.py:218
-#: data/usr/share/applications/ayatana-webmail.desktop:35
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr ""
 
-#: ayatanawebmail/application.py:957
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:1110
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr ""
 
-#: ayatanawebmail/application.py:1111
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
-msgid "Unable to connect to account \"{accountName}\", the application will now exit."
+msgid ""
+"Unable to connect to account \"{accountName}\", the application will now "
+"exit."
 msgstr ""
 
-#: ayatanawebmail/application.py:1136
+#: /ayatanawebmail/application.py:1131
 #, python-format
-msgid "You have %d unread mail"
-msgid_plural "You have %d unread mails"
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ayatanawebmail/application.py:1163
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr ""
 
-#: ayatanawebmail/application.py:1165
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1167
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1180
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:60
-msgid "If this string starts with http:// or https://, the application will open it in your browser - otherwise, it will be run as a command"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:61
+msgid ""
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:90 ayatanawebmail/dialog.py:104
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:132
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:140
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:141
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:142
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:143
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:204
-msgid "Please visit the following link and enable access for less secure apps:"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:206
-msgid "Access blocked by Google"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:210
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:211
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:234
-msgid "Custom"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:242
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr "যোগ করা"
 
-#: ayatanawebmail/dialog.py:244
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:286
-msgid "The application will append this string to \"Inbox\" to access a specific message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+#: /ayatanawebmail/dialog.py:276
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:288
+#: /ayatanawebmail/dialog.py:278
 msgid "Account:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:290
+#: /ayatanawebmail/dialog.py:280
 msgid "Server:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:292
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:294
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:296
+#: /ayatanawebmail/dialog.py:286
 msgid "Username:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:298
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:300
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:302
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:296
 msgid "Sent:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:308
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:310
+#: /ayatanawebmail/dialog.py:300
 msgid "Message:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:346
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:347
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:348
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:358
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:360
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:362
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:364
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:369
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:376
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:392
+#: /ayatanawebmail/dialog.py:382
 msgid "Report a bug"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:394
+#: /ayatanawebmail/dialog.py:384
 msgid "Request a feature"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:396 ayatanawebmail/dialog.py:399
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
 #, python-brace-format
 msgid "It's a good idea to add the {labelname} label to your issue."
 msgstr ""
 
-#: ayatanawebmail/dialog.py:397
+#: /ayatanawebmail/dialog.py:387
 msgid "Ask a question"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:400
+#: /ayatanawebmail/dialog.py:390
 msgid "Help translate"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:402
+#: /ayatanawebmail/dialog.py:392
 msgid "Source code"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:404
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:424
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:5
-msgid "Display notifications about new mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+msgid "Enable notifications"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:5
-msgid "Webmail notifications and actions for any desktop"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:15
-msgid "Mark all as read"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:20
-msgid "Compose Mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+msgid "Play sound when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:25
-msgid "Sent"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+#, fuzzy
+msgid "Hide message count"
+msgstr "বার্তা ক্রিয়া"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:30
-msgid "Inbox"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+msgid "Run this command when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+msgid "Custom sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+msgid "Play a custom sound when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+msgid "Merge messages"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+msgid "Merge messages belonging to the same conversation."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+#, fuzzy
+msgid "Message action"
+msgstr "বার্তা ক্রিয়া"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+msgid "Action to perform when a message is activated."
 msgstr ""
diff --git a/po/bo.po b/po/bo.po
index df6f4ab..ff74536 100644
--- a/po/bo.po
+++ b/po/bo.po
@@ -6,9 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail 22.6.28\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/"
-"issues\n"
-"POT-Creation-Date: 2020-08-22 20:15+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -18,299 +17,328 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr ""
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr ""
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr ""
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:204
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr ""
 
-#: ayatanawebmail/application.py:211
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr ""
 
-#: ayatanawebmail/application.py:218
-#: data/usr/share/applications/ayatana-webmail.desktop:35
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr ""
 
-#: ayatanawebmail/application.py:957
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:1110
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr ""
 
-#: ayatanawebmail/application.py:1111
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
-msgid "Unable to connect to account \"{accountName}\", the application will now exit."
+msgid ""
+"Unable to connect to account \"{accountName}\", the application will now "
+"exit."
 msgstr ""
 
-#: ayatanawebmail/application.py:1136
+#: /ayatanawebmail/application.py:1131
 #, python-format
-msgid "You have %d unread mail"
-msgid_plural "You have %d unread mails"
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
 msgstr[0] ""
 
-#: ayatanawebmail/application.py:1163
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr ""
 
-#: ayatanawebmail/application.py:1165
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1167
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1180
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:60
-msgid "If this string starts with http:// or https://, the application will open it in your browser - otherwise, it will be run as a command"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:61
+msgid ""
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:90 ayatanawebmail/dialog.py:104
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:132
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:140
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:141
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:142
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:143
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:204
-msgid "Please visit the following link and enable access for less secure apps:"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:206
-msgid "Access blocked by Google"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:210
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:211
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:234
-msgid "Custom"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:242
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:244
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:286
-msgid "The application will append this string to \"Inbox\" to access a specific message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+#: /ayatanawebmail/dialog.py:276
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:288
+#: /ayatanawebmail/dialog.py:278
 msgid "Account:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:290
+#: /ayatanawebmail/dialog.py:280
 msgid "Server:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:292
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:294
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:296
+#: /ayatanawebmail/dialog.py:286
 msgid "Username:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:298
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:300
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:302
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:296
 msgid "Sent:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:308
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:310
+#: /ayatanawebmail/dialog.py:300
 msgid "Message:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:346
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:347
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:348
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:358
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:360
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:362
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:364
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:369
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:376
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:392
+#: /ayatanawebmail/dialog.py:382
 msgid "Report a bug"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:394
+#: /ayatanawebmail/dialog.py:384
 msgid "Request a feature"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:396 ayatanawebmail/dialog.py:399
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
 #, python-brace-format
 msgid "It's a good idea to add the {labelname} label to your issue."
 msgstr ""
 
-#: ayatanawebmail/dialog.py:397
+#: /ayatanawebmail/dialog.py:387
 msgid "Ask a question"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:400
+#: /ayatanawebmail/dialog.py:390
 msgid "Help translate"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:402
+#: /ayatanawebmail/dialog.py:392
 msgid "Source code"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:404
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:424
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+msgid "Enable notifications"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+msgid "Play sound when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+msgid "Hide message count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:5
-msgid "Display notifications about new mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+msgid "Run this command when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+msgid "Custom sound"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:5
-msgid "Webmail notifications and actions for any desktop"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+msgid "Play a custom sound when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:15
-msgid "Mark all as read"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+msgid "Merge messages"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:20
-msgid "Compose Mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+msgid "Merge messages belonging to the same conversation."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:25
-msgid "Sent"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+msgid "Message action"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:30
-msgid "Inbox"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+msgid "Action to perform when a message is activated."
 msgstr ""
diff --git a/po/br.po b/po/br.po
index d685140..71c5d3f 100644
--- a/po/br.po
+++ b/po/br.po
@@ -6,9 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail 22.6.28\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/"
-"issues\n"
-"POT-Creation-Date: 2020-08-22 20:15+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -18,307 +17,336 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=5; plural=(n % 10 == 1 && n % 100 != 11 && n % 100 != "
 "71 && n % 100 != 91) ? 0 : ((n % 10 == 2 && n % 100 != 12 && n % 100 != 72 "
-"&& n % 100 != 92) ? 1 : ((((n % 10 == 3 || n % 10 == 4) || n % 10 == 9) && ("
-"n % 100 < 10 || n % 100 > 19) && (n % 100 < 70 || n % 100 > 79) && (n % 100 "
+"&& n % 100 != 92) ? 1 : ((((n % 10 == 3 || n % 10 == 4) || n % 10 == 9) && "
+"(n % 100 < 10 || n % 100 > 19) && (n % 100 < 70 || n % 100 > 79) && (n % 100 "
 "< 90 || n % 100 > 99)) ? 2 : ((n != 0 && n % 1000000 == 0) ? 3 : 4)));\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr ""
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr ""
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr ""
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:204
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr ""
 
-#: ayatanawebmail/application.py:211
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr ""
 
-#: ayatanawebmail/application.py:218
-#: data/usr/share/applications/ayatana-webmail.desktop:35
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr ""
 
-#: ayatanawebmail/application.py:957
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:1110
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr ""
 
-#: ayatanawebmail/application.py:1111
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
-msgid "Unable to connect to account \"{accountName}\", the application will now exit."
+msgid ""
+"Unable to connect to account \"{accountName}\", the application will now "
+"exit."
 msgstr ""
 
-#: ayatanawebmail/application.py:1136
+#: /ayatanawebmail/application.py:1131
 #, python-format
-msgid "You have %d unread mail"
-msgid_plural "You have %d unread mails"
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 msgstr[4] ""
 
-#: ayatanawebmail/application.py:1163
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr ""
 
-#: ayatanawebmail/application.py:1165
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1167
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1180
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:60
-msgid "If this string starts with http:// or https://, the application will open it in your browser - otherwise, it will be run as a command"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:61
+msgid ""
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:90 ayatanawebmail/dialog.py:104
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:132
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:140
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:141
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:142
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:143
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:204
-msgid "Please visit the following link and enable access for less secure apps:"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:206
-msgid "Access blocked by Google"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:210
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:211
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:234
-msgid "Custom"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:242
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:244
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:286
-msgid "The application will append this string to \"Inbox\" to access a specific message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+#: /ayatanawebmail/dialog.py:276
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:288
+#: /ayatanawebmail/dialog.py:278
 msgid "Account:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:290
+#: /ayatanawebmail/dialog.py:280
 msgid "Server:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:292
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:294
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:296
+#: /ayatanawebmail/dialog.py:286
 msgid "Username:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:298
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:300
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:302
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:296
 msgid "Sent:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:308
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:310
+#: /ayatanawebmail/dialog.py:300
 msgid "Message:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:346
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:347
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:348
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:358
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:360
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:362
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:364
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:369
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:376
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:392
+#: /ayatanawebmail/dialog.py:382
 msgid "Report a bug"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:394
+#: /ayatanawebmail/dialog.py:384
 msgid "Request a feature"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:396 ayatanawebmail/dialog.py:399
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
 #, python-brace-format
 msgid "It's a good idea to add the {labelname} label to your issue."
 msgstr ""
 
-#: ayatanawebmail/dialog.py:397
+#: /ayatanawebmail/dialog.py:387
 msgid "Ask a question"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:400
+#: /ayatanawebmail/dialog.py:390
 msgid "Help translate"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:402
+#: /ayatanawebmail/dialog.py:392
 msgid "Source code"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:404
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:424
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+msgid "Enable notifications"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+msgid "Play sound when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+msgid "Hide message count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:5
-msgid "Display notifications about new mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+msgid "Run this command when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+msgid "Custom sound"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:5
-msgid "Webmail notifications and actions for any desktop"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+msgid "Play a custom sound when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:15
-msgid "Mark all as read"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+msgid "Merge messages"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:20
-msgid "Compose Mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+msgid "Merge messages belonging to the same conversation."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:25
-msgid "Sent"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+msgid "Message action"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:30
-msgid "Inbox"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+msgid "Action to perform when a message is activated."
 msgstr ""
diff --git a/po/bs.po b/po/bs.po
index ae3a968..4bbaf6a 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -6,9 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail 22.6.28\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/"
-"issues\n"
-"POT-Creation-Date: 2020-08-22 20:15+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -19,301 +18,330 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr ""
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr ""
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr ""
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:204
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr ""
 
-#: ayatanawebmail/application.py:211
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr ""
 
-#: ayatanawebmail/application.py:218
-#: data/usr/share/applications/ayatana-webmail.desktop:35
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr ""
 
-#: ayatanawebmail/application.py:957
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:1110
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr ""
 
-#: ayatanawebmail/application.py:1111
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
-msgid "Unable to connect to account \"{accountName}\", the application will now exit."
+msgid ""
+"Unable to connect to account \"{accountName}\", the application will now "
+"exit."
 msgstr ""
 
-#: ayatanawebmail/application.py:1136
+#: /ayatanawebmail/application.py:1131
 #, python-format
-msgid "You have %d unread mail"
-msgid_plural "You have %d unread mails"
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: ayatanawebmail/application.py:1163
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr ""
 
-#: ayatanawebmail/application.py:1165
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1167
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1180
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:60
-msgid "If this string starts with http:// or https://, the application will open it in your browser - otherwise, it will be run as a command"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:61
+msgid ""
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:90 ayatanawebmail/dialog.py:104
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:132
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:140
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:141
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:142
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:143
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:204
-msgid "Please visit the following link and enable access for less secure apps:"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:206
-msgid "Access blocked by Google"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:210
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:211
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:234
-msgid "Custom"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:242
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:244
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:286
-msgid "The application will append this string to \"Inbox\" to access a specific message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+#: /ayatanawebmail/dialog.py:276
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:288
+#: /ayatanawebmail/dialog.py:278
 msgid "Account:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:290
+#: /ayatanawebmail/dialog.py:280
 msgid "Server:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:292
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:294
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:296
+#: /ayatanawebmail/dialog.py:286
 msgid "Username:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:298
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:300
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:302
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:296
 msgid "Sent:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:308
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:310
+#: /ayatanawebmail/dialog.py:300
 msgid "Message:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:346
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:347
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:348
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:358
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:360
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:362
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:364
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:369
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:376
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:392
+#: /ayatanawebmail/dialog.py:382
 msgid "Report a bug"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:394
+#: /ayatanawebmail/dialog.py:384
 msgid "Request a feature"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:396 ayatanawebmail/dialog.py:399
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
 #, python-brace-format
 msgid "It's a good idea to add the {labelname} label to your issue."
 msgstr ""
 
-#: ayatanawebmail/dialog.py:397
+#: /ayatanawebmail/dialog.py:387
 msgid "Ask a question"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:400
+#: /ayatanawebmail/dialog.py:390
 msgid "Help translate"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:402
+#: /ayatanawebmail/dialog.py:392
 msgid "Source code"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:404
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:424
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+msgid "Enable notifications"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+msgid "Play sound when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+msgid "Hide message count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:5
-msgid "Display notifications about new mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+msgid "Run this command when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+msgid "Custom sound"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:5
-msgid "Webmail notifications and actions for any desktop"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+msgid "Play a custom sound when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:15
-msgid "Mark all as read"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+msgid "Merge messages"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:20
-msgid "Compose Mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+msgid "Merge messages belonging to the same conversation."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:25
-msgid "Sent"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+msgid "Message action"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:30
-msgid "Inbox"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+msgid "Action to perform when a message is activated."
 msgstr ""
diff --git a/po/ca.po b/po/ca.po
index 6b303d1..2aac903 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -6,13 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/"
-"issues\n"
-"POT-Creation-Date: 2020-04-03 12:21+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: 2020-10-30 00:26+0000\n"
 "Last-Translator: Joan CiberSheep <cibersheep@gmail.com>\n"
-"Language-Team: Catalan <https://hosted.weblate.org/projects/"
-"ayatana-indicators/ayatana-webmail/ca/>\n"
+"Language-Team: Catalan <https://hosted.weblate.org/projects/ayatana-"
+"indicators/ayatana-webmail/ca/>\n"
 "Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,59 +20,59 @@ msgstr ""
 "X-Generator: Weblate 4.3.2-dev\n"
 "X-Launchpad-Export-Date: 2020-04-04 05:58+0000\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr "Seleccioneu un compte"
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr "Quina ordre o pàgina web del compte voleu obrir?"
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr "Accions del missatge"
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr "Suprimeix"
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr "Marca’l com a llegit"
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr "Obre un missatge/executa una ordre"
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr "Remitent"
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr "Assumpte"
 
-#: ayatanawebmail/application.py:205
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr "Obre la pàgina d'inici de correu web"
 
-#: ayatanawebmail/application.py:212
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr "Neteja"
 
-#: ayatanawebmail/application.py:219
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr "Paràmetres"
 
-#: ayatanawebmail/application.py:980
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr "Sense assumpte"
 
-#: ayatanawebmail/application.py:1132
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr "Error de connexió"
 
-#: ayatanawebmail/application.py:1133
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
 msgid ""
 "Unable to connect to account \"{accountName}\", the application will now "
@@ -82,258 +81,350 @@ msgstr ""
 "No s’ha pogut connectar al compte «{accountName}»; l’aplicació es tancarà "
 "ara."
 
-#: ayatanawebmail/application.py:1133
-#, python-brace-format
-msgid "You can run \"{command}\" to delete all your login settings."
-msgstr ""
-"Ara podeu executar «{command}» per a suprimir tota la vostra configuració d’"
-"inici de sessió."
-
-#: ayatanawebmail/application.py:1158
-#, python-format
-msgid "You have %d unread mail"
-msgid_plural "You have %d unread mails"
+#: /ayatanawebmail/application.py:1131
+#, fuzzy, python-format
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
 msgstr[0] "Teniu %d missatge per llegir"
 msgstr[1] "Teniu %d missatges per llegir"
 
-#: ayatanawebmail/application.py:1185
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr "d’%(t0)s, %(t1)s i uns altres"
 
-#: ayatanawebmail/application.py:1187
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr "de %(t0)s, i %(t1)s"
 
-#: ayatanawebmail/application.py:1189
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr "de %s"
 
-#: ayatanawebmail/application.py:1202
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr "Correu nou de %s"
 
-#: ayatanawebmail/dialog.py:60
-msgid "Web page"
-msgstr "Pàgina web"
-
-#: ayatanawebmail/dialog.py:61
-msgid "Command"
-msgstr "Ordre"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
+msgstr ""
 
-#: ayatanawebmail/dialog.py:93
+#: /ayatanawebmail/dialog.py:61
 msgid ""
-"Append an additional string - you can use the $MSG_THREAD and $MSG_UID "
-"placeholders."
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
-"Afegiu una cadena addicional: podeu utilitzar les variables $MSG_THREAD i "
-"$MSG_UID."
 
-#: ayatanawebmail/dialog.py:114 ayatanawebmail/dialog.py:128
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr "(Cap)"
 
-#: ayatanawebmail/dialog.py:156
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr "Preferències de l’Ayatana Webmail"
 
-#: ayatanawebmail/dialog.py:164
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr "Comptes"
 
-#: ayatanawebmail/dialog.py:165
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr "Opcions"
 
-#: ayatanawebmail/dialog.py:166
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr "Assistència"
 
-#: ayatanawebmail/dialog.py:167
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr "Quant a"
 
-#: ayatanawebmail/dialog.py:228
-msgid ""
-"Please visit the following link and enable access for less secure apps:"
-msgstr ""
-"Visiteu l’enllaç següent i activeu l’accés a les aplicacions menys segures:"
-
-#: ayatanawebmail/dialog.py:230
-msgid "Access blocked by Google"
-msgstr "Google n’ha blocat l’accés"
-
-#: ayatanawebmail/dialog.py:234
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr "La connexió al compte de correu ha fallat amb error:"
 
-#: ayatanawebmail/dialog.py:235
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr "La connexió ha fallat"
 
-#: ayatanawebmail/dialog.py:254
-msgid "Choose an account"
-msgstr "Trieu un compte"
-
-#: ayatanawebmail/dialog.py:259
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr "Afegeix"
 
-#: ayatanawebmail/dialog.py:261
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr "Elimina"
 
-#: ayatanawebmail/dialog.py:276
-msgid "Server data"
-msgstr "Dades del servidor"
+#: /ayatanawebmail/dialog.py:276
+#, fuzzy
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+msgstr ""
+"Afegiu una cadena addicional: podeu utilitzar les variables $MSG_THREAD i "
+"$MSG_UID."
 
-#: ayatanawebmail/dialog.py:278
-msgid "Account data"
-msgstr "Dades del compte"
+#: /ayatanawebmail/dialog.py:278
+#, fuzzy
+msgid "Account:"
+msgstr "Comptes"
 
-#: ayatanawebmail/dialog.py:289
-msgid "Links"
-msgstr "Enllaços"
+#: /ayatanawebmail/dialog.py:280
+#, fuzzy
+msgid "Server:"
+msgstr "Dades del servidor"
 
-#: ayatanawebmail/dialog.py:297
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr "Amfitrió:"
 
-#: ayatanawebmail/dialog.py:299
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr "Port:"
 
-#: ayatanawebmail/dialog.py:302
-msgid "Login:"
-msgstr "Nom d’usuari:"
+#: /ayatanawebmail/dialog.py:286
+msgid "Username:"
+msgstr ""
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr "Contrasenya:"
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr "Carpetes:"
 
-#: ayatanawebmail/dialog.py:309
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr "Inici:"
 
-#: ayatanawebmail/dialog.py:311
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr "Redacció:"
 
-#: ayatanawebmail/dialog.py:313
+#: /ayatanawebmail/dialog.py:296
+msgid "Sent:"
+msgstr "Enviats:"
+
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr "Safata d’entrada:"
 
-#: ayatanawebmail/dialog.py:316
-msgid "Sent:"
-msgstr "Enviats:"
+#: /ayatanawebmail/dialog.py:300
+#, fuzzy
+msgid "Message:"
+msgstr "Accions del missatge"
 
-#: ayatanawebmail/dialog.py:354
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr "Marca el missatge com a llegit"
 
-#: ayatanawebmail/dialog.py:355
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr "Obre el missatge al navegador o executa una ordre"
 
-#: ayatanawebmail/dialog.py:356
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr "Demana'm què fer"
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr "Habilita les notificacions:"
 
-#: ayatanawebmail/dialog.py:368
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr "Reprodueix un so en rebre un missatge:"
 
-#: ayatanawebmail/dialog.py:370
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr "Uneix els missatges d'una mateixa conversa:"
 
-#: ayatanawebmail/dialog.py:372
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr "Amaga el recompte si és zero:"
 
-#: ayatanawebmail/dialog.py:374
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr "Quan s'activa un missatge:"
 
-#: ayatanawebmail/dialog.py:377
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr "Executa aquesta ordre en rebre un missatge:"
 
-#: ayatanawebmail/dialog.py:384
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr "So personalitzat a reproduir:"
 
-#: ayatanawebmail/dialog.py:400
-msgid "Report a bug/Request a feature"
+#: /ayatanawebmail/dialog.py:382
+msgid "Report a bug"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:384
+#, fuzzy
+msgid "Request a feature"
 msgstr "Informeu d'un error o demaneu una funció"
 
-#: ayatanawebmail/dialog.py:402
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
+#, python-brace-format
+msgid "It's a good idea to add the {labelname} label to your issue."
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:387
 msgid "Ask a question"
 msgstr "Feu-nos una pregunta"
 
-#: ayatanawebmail/dialog.py:404
+#: /ayatanawebmail/dialog.py:390
 msgid "Help translate"
 msgstr "Ajudeu amb la traducció"
 
-#: ayatanawebmail/dialog.py:406
-msgid "Project page"
-msgstr "Pàgina del projecte"
-
-#: ayatanawebmail/dialog.py:408
+#: /ayatanawebmail/dialog.py:392
 msgid "Source code"
 msgstr "Codi font"
 
-#: ayatanawebmail/dialog.py:410
-msgid "Repository"
-msgstr "Dipòsit"
-
-#: ayatanawebmail/dialog.py:412
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr "Lloc web"
 
-#: ayatanawebmail/dialog.py:426
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr "Adolfo Jayme Barrientos <fitojb@ubuntu.com>, 2020"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
-msgstr "Correu de l'Ayatana"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+#, fuzzy
+msgid "Enable notifications"
+msgstr "Habilita les notificacions:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+#, fuzzy
+msgid "Play sound when new messages arrive."
+msgstr "Reprodueix un so en rebre un missatge:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+#, fuzzy
+msgid "Hide message count"
+msgstr "Obre un missatge/executa una ordre"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+#, fuzzy
+msgid "Run this command when new messages arrive."
+msgstr "Executa aquesta ordre en rebre un missatge:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+#, fuzzy
+msgid "Custom sound"
+msgstr "So personalitzat a reproduir:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+#, fuzzy
+msgid "Play a custom sound when new messages arrive."
+msgstr "Reprodueix un so en rebre un missatge:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+#, fuzzy
+msgid "Merge messages"
+msgstr "Marca el missatge com a llegit"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+#, fuzzy
+msgid "Merge messages belonging to the same conversation."
+msgstr "Uneix els missatges d'una mateixa conversa:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+#, fuzzy
+msgid "Message action"
+msgstr "Accions del missatge"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+#, fuzzy
+msgid "Action to perform when a message is activated."
+msgstr "Quan s'activa un missatge:"
+
+#, python-brace-format
+#~ msgid "You can run \"{command}\" to delete all your login settings."
+#~ msgstr ""
+#~ "Ara podeu executar «{command}» per a suprimir tota la vostra configuració "
+#~ "d’inici de sessió."
+
+#~ msgid "Web page"
+#~ msgstr "Pàgina web"
+
+#~ msgid "Command"
+#~ msgstr "Ordre"
+
+#~ msgid ""
+#~ "Please visit the following link and enable access for less secure apps:"
+#~ msgstr ""
+#~ "Visiteu l’enllaç següent i activeu l’accés a les aplicacions menys "
+#~ "segures:"
+
+#~ msgid "Access blocked by Google"
+#~ msgstr "Google n’ha blocat l’accés"
+
+#~ msgid "Choose an account"
+#~ msgstr "Trieu un compte"
+
+#~ msgid "Account data"
+#~ msgstr "Dades del compte"
+
+#~ msgid "Links"
+#~ msgstr "Enllaços"
+
+#~ msgid "Login:"
+#~ msgstr "Nom d’usuari:"
+
+#~ msgid "Project page"
+#~ msgstr "Pàgina del projecte"
+
+#~ msgid "Repository"
+#~ msgstr "Dipòsit"
+
+#~ msgid "Ayatana Webmail"
+#~ msgstr "Correu de l'Ayatana"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:39
-msgid "Webmail notifications and actions for any desktop"
-msgstr "Notificacions i accions de correu web per a qualsevol escriptori"
+#~ msgid "Webmail notifications and actions for any desktop"
+#~ msgstr "Notificacions i accions de correu web per a qualsevol escriptori"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:74
-msgid "Mark all as read"
-msgstr "Marca-ho tot com a llegit"
+#~ msgid "Mark all as read"
+#~ msgstr "Marca-ho tot com a llegit"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:112
-msgid "Compose Mail"
-msgstr "Redacta un missatge"
+#~ msgid "Compose Mail"
+#~ msgstr "Redacta un missatge"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:152
-msgid "Sent"
-msgstr "Enviat"
+#~ msgid "Sent"
+#~ msgstr "Enviat"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:228
-msgid "Inbox"
-msgstr "Safata d’entrada"
+#~ msgid "Inbox"
+#~ msgstr "Safata d’entrada"
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
-msgstr "Correu web Ayatana (servei)"
+#~ msgid "Ayatana Webmail (service)"
+#~ msgstr "Correu web Ayatana (servei)"
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:38
-msgid "Display notifications about new mail"
-msgstr "Mostra notifications quan hi hagi correu nou"
+#~ msgid "Display notifications about new mail"
+#~ msgstr "Mostra notifications quan hi hagi correu nou"
diff --git a/po/ca@valencia.po b/po/ca@valencia.po
index 5844926..77081ba 100644
--- a/po/ca@valencia.po
+++ b/po/ca@valencia.po
@@ -6,9 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail 22.6.28\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/"
-"issues\n"
-"POT-Creation-Date: 2020-08-22 20:15+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -18,300 +17,329 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr ""
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr ""
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr ""
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:204
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr ""
 
-#: ayatanawebmail/application.py:211
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr ""
 
-#: ayatanawebmail/application.py:218
-#: data/usr/share/applications/ayatana-webmail.desktop:35
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr ""
 
-#: ayatanawebmail/application.py:957
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:1110
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr ""
 
-#: ayatanawebmail/application.py:1111
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
-msgid "Unable to connect to account \"{accountName}\", the application will now exit."
+msgid ""
+"Unable to connect to account \"{accountName}\", the application will now "
+"exit."
 msgstr ""
 
-#: ayatanawebmail/application.py:1136
+#: /ayatanawebmail/application.py:1131
 #, python-format
-msgid "You have %d unread mail"
-msgid_plural "You have %d unread mails"
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ayatanawebmail/application.py:1163
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr ""
 
-#: ayatanawebmail/application.py:1165
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1167
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1180
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:60
-msgid "If this string starts with http:// or https://, the application will open it in your browser - otherwise, it will be run as a command"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:61
+msgid ""
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:90 ayatanawebmail/dialog.py:104
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:132
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:140
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:141
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:142
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:143
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:204
-msgid "Please visit the following link and enable access for less secure apps:"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:206
-msgid "Access blocked by Google"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:210
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:211
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:234
-msgid "Custom"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:242
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:244
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:286
-msgid "The application will append this string to \"Inbox\" to access a specific message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+#: /ayatanawebmail/dialog.py:276
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:288
+#: /ayatanawebmail/dialog.py:278
 msgid "Account:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:290
+#: /ayatanawebmail/dialog.py:280
 msgid "Server:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:292
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:294
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:296
+#: /ayatanawebmail/dialog.py:286
 msgid "Username:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:298
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:300
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:302
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:296
 msgid "Sent:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:308
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:310
+#: /ayatanawebmail/dialog.py:300
 msgid "Message:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:346
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:347
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:348
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:358
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:360
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:362
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:364
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:369
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:376
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:392
+#: /ayatanawebmail/dialog.py:382
 msgid "Report a bug"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:394
+#: /ayatanawebmail/dialog.py:384
 msgid "Request a feature"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:396 ayatanawebmail/dialog.py:399
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
 #, python-brace-format
 msgid "It's a good idea to add the {labelname} label to your issue."
 msgstr ""
 
-#: ayatanawebmail/dialog.py:397
+#: /ayatanawebmail/dialog.py:387
 msgid "Ask a question"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:400
+#: /ayatanawebmail/dialog.py:390
 msgid "Help translate"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:402
+#: /ayatanawebmail/dialog.py:392
 msgid "Source code"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:404
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:424
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+msgid "Enable notifications"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+msgid "Play sound when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+msgid "Hide message count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:5
-msgid "Display notifications about new mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+msgid "Run this command when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+msgid "Custom sound"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:5
-msgid "Webmail notifications and actions for any desktop"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+msgid "Play a custom sound when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:15
-msgid "Mark all as read"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+msgid "Merge messages"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:20
-msgid "Compose Mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+msgid "Merge messages belonging to the same conversation."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:25
-msgid "Sent"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+msgid "Message action"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:30
-msgid "Inbox"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+msgid "Action to perform when a message is activated."
 msgstr ""
diff --git a/po/ce.po b/po/ce.po
index 0872a18..e918190 100644
--- a/po/ce.po
+++ b/po/ce.po
@@ -6,9 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail 22.6.28\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/"
-"issues\n"
-"POT-Creation-Date: 2020-08-22 20:15+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -18,300 +17,329 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr ""
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr ""
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr ""
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:204
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr ""
 
-#: ayatanawebmail/application.py:211
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr ""
 
-#: ayatanawebmail/application.py:218
-#: data/usr/share/applications/ayatana-webmail.desktop:35
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr ""
 
-#: ayatanawebmail/application.py:957
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:1110
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr ""
 
-#: ayatanawebmail/application.py:1111
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
-msgid "Unable to connect to account \"{accountName}\", the application will now exit."
+msgid ""
+"Unable to connect to account \"{accountName}\", the application will now "
+"exit."
 msgstr ""
 
-#: ayatanawebmail/application.py:1136
+#: /ayatanawebmail/application.py:1131
 #, python-format
-msgid "You have %d unread mail"
-msgid_plural "You have %d unread mails"
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ayatanawebmail/application.py:1163
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr ""
 
-#: ayatanawebmail/application.py:1165
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1167
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1180
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:60
-msgid "If this string starts with http:// or https://, the application will open it in your browser - otherwise, it will be run as a command"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:61
+msgid ""
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:90 ayatanawebmail/dialog.py:104
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:132
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:140
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:141
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:142
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:143
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:204
-msgid "Please visit the following link and enable access for less secure apps:"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:206
-msgid "Access blocked by Google"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:210
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:211
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:234
-msgid "Custom"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:242
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:244
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:286
-msgid "The application will append this string to \"Inbox\" to access a specific message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+#: /ayatanawebmail/dialog.py:276
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:288
+#: /ayatanawebmail/dialog.py:278
 msgid "Account:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:290
+#: /ayatanawebmail/dialog.py:280
 msgid "Server:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:292
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:294
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:296
+#: /ayatanawebmail/dialog.py:286
 msgid "Username:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:298
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:300
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:302
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:296
 msgid "Sent:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:308
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:310
+#: /ayatanawebmail/dialog.py:300
 msgid "Message:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:346
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:347
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:348
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:358
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:360
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:362
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:364
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:369
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:376
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:392
+#: /ayatanawebmail/dialog.py:382
 msgid "Report a bug"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:394
+#: /ayatanawebmail/dialog.py:384
 msgid "Request a feature"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:396 ayatanawebmail/dialog.py:399
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
 #, python-brace-format
 msgid "It's a good idea to add the {labelname} label to your issue."
 msgstr ""
 
-#: ayatanawebmail/dialog.py:397
+#: /ayatanawebmail/dialog.py:387
 msgid "Ask a question"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:400
+#: /ayatanawebmail/dialog.py:390
 msgid "Help translate"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:402
+#: /ayatanawebmail/dialog.py:392
 msgid "Source code"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:404
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:424
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+msgid "Enable notifications"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+msgid "Play sound when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+msgid "Hide message count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:5
-msgid "Display notifications about new mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+msgid "Run this command when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+msgid "Custom sound"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:5
-msgid "Webmail notifications and actions for any desktop"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+msgid "Play a custom sound when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:15
-msgid "Mark all as read"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+msgid "Merge messages"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:20
-msgid "Compose Mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+msgid "Merge messages belonging to the same conversation."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:25
-msgid "Sent"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+msgid "Message action"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:30
-msgid "Inbox"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+msgid "Action to perform when a message is activated."
 msgstr ""
diff --git a/po/ckb.po b/po/ckb.po
index 9dc5bd8..955a5fe 100644
--- a/po/ckb.po
+++ b/po/ckb.po
@@ -6,9 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail 22.6.28\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/"
-"issues\n"
-"POT-Creation-Date: 2020-08-22 20:15+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -18,300 +17,329 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr ""
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr ""
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr ""
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:204
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr ""
 
-#: ayatanawebmail/application.py:211
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr ""
 
-#: ayatanawebmail/application.py:218
-#: data/usr/share/applications/ayatana-webmail.desktop:35
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr ""
 
-#: ayatanawebmail/application.py:957
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:1110
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr ""
 
-#: ayatanawebmail/application.py:1111
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
-msgid "Unable to connect to account \"{accountName}\", the application will now exit."
+msgid ""
+"Unable to connect to account \"{accountName}\", the application will now "
+"exit."
 msgstr ""
 
-#: ayatanawebmail/application.py:1136
+#: /ayatanawebmail/application.py:1131
 #, python-format
-msgid "You have %d unread mail"
-msgid_plural "You have %d unread mails"
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ayatanawebmail/application.py:1163
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr ""
 
-#: ayatanawebmail/application.py:1165
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1167
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1180
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:60
-msgid "If this string starts with http:// or https://, the application will open it in your browser - otherwise, it will be run as a command"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:61
+msgid ""
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:90 ayatanawebmail/dialog.py:104
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:132
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:140
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:141
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:142
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:143
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:204
-msgid "Please visit the following link and enable access for less secure apps:"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:206
-msgid "Access blocked by Google"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:210
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:211
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:234
-msgid "Custom"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:242
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:244
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:286
-msgid "The application will append this string to \"Inbox\" to access a specific message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+#: /ayatanawebmail/dialog.py:276
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:288
+#: /ayatanawebmail/dialog.py:278
 msgid "Account:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:290
+#: /ayatanawebmail/dialog.py:280
 msgid "Server:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:292
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:294
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:296
+#: /ayatanawebmail/dialog.py:286
 msgid "Username:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:298
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:300
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:302
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:296
 msgid "Sent:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:308
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:310
+#: /ayatanawebmail/dialog.py:300
 msgid "Message:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:346
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:347
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:348
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:358
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:360
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:362
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:364
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:369
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:376
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:392
+#: /ayatanawebmail/dialog.py:382
 msgid "Report a bug"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:394
+#: /ayatanawebmail/dialog.py:384
 msgid "Request a feature"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:396 ayatanawebmail/dialog.py:399
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
 #, python-brace-format
 msgid "It's a good idea to add the {labelname} label to your issue."
 msgstr ""
 
-#: ayatanawebmail/dialog.py:397
+#: /ayatanawebmail/dialog.py:387
 msgid "Ask a question"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:400
+#: /ayatanawebmail/dialog.py:390
 msgid "Help translate"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:402
+#: /ayatanawebmail/dialog.py:392
 msgid "Source code"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:404
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:424
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+msgid "Enable notifications"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+msgid "Play sound when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+msgid "Hide message count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:5
-msgid "Display notifications about new mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+msgid "Run this command when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+msgid "Custom sound"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:5
-msgid "Webmail notifications and actions for any desktop"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+msgid "Play a custom sound when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:15
-msgid "Mark all as read"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+msgid "Merge messages"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:20
-msgid "Compose Mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+msgid "Merge messages belonging to the same conversation."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:25
-msgid "Sent"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+msgid "Message action"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:30
-msgid "Inbox"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+msgid "Action to perform when a message is activated."
 msgstr ""
diff --git a/po/co.po b/po/co.po
index 4b8f1df..216160b 100644
--- a/po/co.po
+++ b/po/co.po
@@ -6,9 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail 22.6.28\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/"
-"issues\n"
-"POT-Creation-Date: 2020-08-22 20:15+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -18,300 +17,329 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr ""
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr ""
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr ""
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:204
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr ""
 
-#: ayatanawebmail/application.py:211
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr ""
 
-#: ayatanawebmail/application.py:218
-#: data/usr/share/applications/ayatana-webmail.desktop:35
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr ""
 
-#: ayatanawebmail/application.py:957
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:1110
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr ""
 
-#: ayatanawebmail/application.py:1111
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
-msgid "Unable to connect to account \"{accountName}\", the application will now exit."
+msgid ""
+"Unable to connect to account \"{accountName}\", the application will now "
+"exit."
 msgstr ""
 
-#: ayatanawebmail/application.py:1136
+#: /ayatanawebmail/application.py:1131
 #, python-format
-msgid "You have %d unread mail"
-msgid_plural "You have %d unread mails"
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ayatanawebmail/application.py:1163
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr ""
 
-#: ayatanawebmail/application.py:1165
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1167
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1180
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:60
-msgid "If this string starts with http:// or https://, the application will open it in your browser - otherwise, it will be run as a command"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:61
+msgid ""
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:90 ayatanawebmail/dialog.py:104
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:132
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:140
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:141
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:142
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:143
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:204
-msgid "Please visit the following link and enable access for less secure apps:"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:206
-msgid "Access blocked by Google"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:210
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:211
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:234
-msgid "Custom"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:242
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:244
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:286
-msgid "The application will append this string to \"Inbox\" to access a specific message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+#: /ayatanawebmail/dialog.py:276
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:288
+#: /ayatanawebmail/dialog.py:278
 msgid "Account:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:290
+#: /ayatanawebmail/dialog.py:280
 msgid "Server:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:292
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:294
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:296
+#: /ayatanawebmail/dialog.py:286
 msgid "Username:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:298
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:300
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:302
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:296
 msgid "Sent:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:308
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:310
+#: /ayatanawebmail/dialog.py:300
 msgid "Message:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:346
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:347
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:348
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:358
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:360
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:362
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:364
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:369
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:376
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:392
+#: /ayatanawebmail/dialog.py:382
 msgid "Report a bug"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:394
+#: /ayatanawebmail/dialog.py:384
 msgid "Request a feature"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:396 ayatanawebmail/dialog.py:399
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
 #, python-brace-format
 msgid "It's a good idea to add the {labelname} label to your issue."
 msgstr ""
 
-#: ayatanawebmail/dialog.py:397
+#: /ayatanawebmail/dialog.py:387
 msgid "Ask a question"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:400
+#: /ayatanawebmail/dialog.py:390
 msgid "Help translate"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:402
+#: /ayatanawebmail/dialog.py:392
 msgid "Source code"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:404
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:424
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+msgid "Enable notifications"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+msgid "Play sound when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+msgid "Hide message count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:5
-msgid "Display notifications about new mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+msgid "Run this command when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+msgid "Custom sound"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:5
-msgid "Webmail notifications and actions for any desktop"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+msgid "Play a custom sound when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:15
-msgid "Mark all as read"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+msgid "Merge messages"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:20
-msgid "Compose Mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+msgid "Merge messages belonging to the same conversation."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:25
-msgid "Sent"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+msgid "Message action"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:30
-msgid "Inbox"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+msgid "Action to perform when a message is activated."
 msgstr ""
diff --git a/po/crh.po b/po/crh.po
index cb50272..3b03140 100644
--- a/po/crh.po
+++ b/po/crh.po
@@ -6,9 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail 22.6.28\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/"
-"issues\n"
-"POT-Creation-Date: 2020-08-22 20:15+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -18,299 +17,328 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr ""
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr ""
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr ""
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:204
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr ""
 
-#: ayatanawebmail/application.py:211
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr ""
 
-#: ayatanawebmail/application.py:218
-#: data/usr/share/applications/ayatana-webmail.desktop:35
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr ""
 
-#: ayatanawebmail/application.py:957
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:1110
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr ""
 
-#: ayatanawebmail/application.py:1111
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
-msgid "Unable to connect to account \"{accountName}\", the application will now exit."
+msgid ""
+"Unable to connect to account \"{accountName}\", the application will now "
+"exit."
 msgstr ""
 
-#: ayatanawebmail/application.py:1136
+#: /ayatanawebmail/application.py:1131
 #, python-format
-msgid "You have %d unread mail"
-msgid_plural "You have %d unread mails"
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
 msgstr[0] ""
 
-#: ayatanawebmail/application.py:1163
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr ""
 
-#: ayatanawebmail/application.py:1165
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1167
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1180
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:60
-msgid "If this string starts with http:// or https://, the application will open it in your browser - otherwise, it will be run as a command"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:61
+msgid ""
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:90 ayatanawebmail/dialog.py:104
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:132
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:140
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:141
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:142
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:143
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:204
-msgid "Please visit the following link and enable access for less secure apps:"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:206
-msgid "Access blocked by Google"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:210
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:211
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:234
-msgid "Custom"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:242
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:244
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:286
-msgid "The application will append this string to \"Inbox\" to access a specific message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+#: /ayatanawebmail/dialog.py:276
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:288
+#: /ayatanawebmail/dialog.py:278
 msgid "Account:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:290
+#: /ayatanawebmail/dialog.py:280
 msgid "Server:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:292
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:294
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:296
+#: /ayatanawebmail/dialog.py:286
 msgid "Username:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:298
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:300
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:302
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:296
 msgid "Sent:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:308
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:310
+#: /ayatanawebmail/dialog.py:300
 msgid "Message:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:346
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:347
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:348
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:358
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:360
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:362
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:364
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:369
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:376
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:392
+#: /ayatanawebmail/dialog.py:382
 msgid "Report a bug"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:394
+#: /ayatanawebmail/dialog.py:384
 msgid "Request a feature"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:396 ayatanawebmail/dialog.py:399
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
 #, python-brace-format
 msgid "It's a good idea to add the {labelname} label to your issue."
 msgstr ""
 
-#: ayatanawebmail/dialog.py:397
+#: /ayatanawebmail/dialog.py:387
 msgid "Ask a question"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:400
+#: /ayatanawebmail/dialog.py:390
 msgid "Help translate"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:402
+#: /ayatanawebmail/dialog.py:392
 msgid "Source code"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:404
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:424
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+msgid "Enable notifications"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+msgid "Play sound when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+msgid "Hide message count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:5
-msgid "Display notifications about new mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+msgid "Run this command when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+msgid "Custom sound"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:5
-msgid "Webmail notifications and actions for any desktop"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+msgid "Play a custom sound when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:15
-msgid "Mark all as read"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+msgid "Merge messages"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:20
-msgid "Compose Mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+msgid "Merge messages belonging to the same conversation."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:25
-msgid "Sent"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+msgid "Message action"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:30
-msgid "Inbox"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+msgid "Action to perform when a message is activated."
 msgstr ""
diff --git a/po/cs.po b/po/cs.po
index b77ca57..900588a 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -6,9 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/"
-"issues\n"
-"POT-Creation-Date: 2020-04-03 12:21+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: 2021-05-01 17:02+0000\n"
 "Last-Translator: Tomáš Marný <tomik.marny@gmail.com>\n"
 "Language-Team: Czech <https://hosted.weblate.org/projects/ayatana-indicators/"
@@ -21,320 +20,412 @@ msgstr ""
 "X-Generator: Weblate 4.7-dev\n"
 "X-Launchpad-Export-Date: 2020-04-04 05:58+0000\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr "Zvolit účet"
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr "Který příkaz / webovou stránku účtů chcete otevřít?"
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr "Akce zpráv"
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr "Vymazat"
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr "Označit jako přečtené"
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr "Otevřít zprávu/Spustit příkaz"
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr "Odesílatel"
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr "Věc"
 
-#: ayatanawebmail/application.py:205
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr "Otevřít domovskou stránku webmailu"
 
-#: ayatanawebmail/application.py:212
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr "Vyčistit"
 
-#: ayatanawebmail/application.py:219
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr "Nastavení"
 
-#: ayatanawebmail/application.py:980
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr "Žádný předmět"
 
-#: ayatanawebmail/application.py:1132
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr "Chyba spojení"
 
-#: ayatanawebmail/application.py:1133
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
 msgid ""
 "Unable to connect to account \"{accountName}\", the application will now "
 "exit."
 msgstr "Nelze se připojit k účtu „{accountName}“, aplikace bude nyní ukončena."
 
-#: ayatanawebmail/application.py:1133
-#, python-brace-format
-msgid "You can run \"{command}\" to delete all your login settings."
-msgstr ""
-"Spuštěním příkazu \"{command}\" můžete smazat všechna vaše nastavení "
-"přihlášení."
-
-#: ayatanawebmail/application.py:1158
-#, python-format
-msgid "You have %d unread mail"
-msgid_plural "You have %d unread mails"
+#: /ayatanawebmail/application.py:1131
+#, fuzzy, python-format
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
 msgstr[0] "Máte %d nepřečtený e-mailů"
 msgstr[1] "Máte %d nepřečtených e-mailů"
 msgstr[2] "You have %d unread mails"
 
-#: ayatanawebmail/application.py:1185
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr "Od %(t0)s, %(t1)s a ostatních"
 
-#: ayatanawebmail/application.py:1187
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr "Od %(t0)s a %(t1)s"
 
-#: ayatanawebmail/application.py:1189
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr "od %s"
 
-#: ayatanawebmail/application.py:1202
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr "Nový e-mail od %s"
 
-#: ayatanawebmail/dialog.py:60
-msgid "Web page"
-msgstr "Webová stránka"
-
-#: ayatanawebmail/dialog.py:61
-msgid "Command"
-msgstr "Příkaz"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
+msgstr ""
 
-#: ayatanawebmail/dialog.py:93
+#: /ayatanawebmail/dialog.py:61
 msgid ""
-"Append an additional string - you can use the $MSG_THREAD and $MSG_UID "
-"placeholders."
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
-"Připojte další řetězec - můžete použít zástupné symboly $ MSG_THREAD a $ "
-"MSG_UID."
 
-#: ayatanawebmail/dialog.py:114 ayatanawebmail/dialog.py:128
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr "(Žádný)"
 
-#: ayatanawebmail/dialog.py:156
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr "Nastavení Ayatana Webmail"
 
-#: ayatanawebmail/dialog.py:164
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr "Účty"
 
-#: ayatanawebmail/dialog.py:165
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr "Volby"
 
-#: ayatanawebmail/dialog.py:166
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr "Podpora"
 
-#: ayatanawebmail/dialog.py:167
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr "O aplikaci"
 
-#: ayatanawebmail/dialog.py:228
-msgid ""
-"Please visit the following link and enable access for less secure apps:"
-msgstr ""
-"Navštivte následující odkaz a povolte přístup pro méně zabezpečené aplikace:"
-
-#: ayatanawebmail/dialog.py:230
-msgid "Access blocked by Google"
-msgstr "Přístup blokovaný společností Google"
-
-#: ayatanawebmail/dialog.py:234
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr "Připojení k e-mailovému účtu se nezdařilo. Vrácená chyba byla:"
 
-#: ayatanawebmail/dialog.py:235
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr "Připojení selhalo"
 
-#: ayatanawebmail/dialog.py:254
-msgid "Choose an account"
-msgstr "Vybrat účet"
-
-#: ayatanawebmail/dialog.py:259
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr "Přidat"
 
-#: ayatanawebmail/dialog.py:261
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr "Odstranit"
 
-#: ayatanawebmail/dialog.py:276
-msgid "Server data"
-msgstr "Údaje o serveru"
+#: /ayatanawebmail/dialog.py:276
+#, fuzzy
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+msgstr ""
+"Připojte další řetězec - můžete použít zástupné symboly $ MSG_THREAD a $ "
+"MSG_UID."
 
-#: ayatanawebmail/dialog.py:278
-msgid "Account data"
-msgstr "Údaje o účtu"
+#: /ayatanawebmail/dialog.py:278
+#, fuzzy
+msgid "Account:"
+msgstr "Účty"
 
-#: ayatanawebmail/dialog.py:289
-msgid "Links"
-msgstr "Odkazy"
+#: /ayatanawebmail/dialog.py:280
+#, fuzzy
+msgid "Server:"
+msgstr "Údaje o serveru"
 
-#: ayatanawebmail/dialog.py:297
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr "Hostitel:"
 
-#: ayatanawebmail/dialog.py:299
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr "Port:"
 
-#: ayatanawebmail/dialog.py:302
-msgid "Login:"
-msgstr "Přihlašovací jméno:"
+#: /ayatanawebmail/dialog.py:286
+msgid "Username:"
+msgstr ""
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr "Heslo:"
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr "Složky:"
 
-#: ayatanawebmail/dialog.py:309
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr "Domů:"
 
-#: ayatanawebmail/dialog.py:311
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr "Napsat:"
 
-#: ayatanawebmail/dialog.py:313
+#: /ayatanawebmail/dialog.py:296
+msgid "Sent:"
+msgstr "Odeslat:"
+
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr "Přijaté:"
 
-#: ayatanawebmail/dialog.py:316
-msgid "Sent:"
-msgstr "Odeslat:"
+#: /ayatanawebmail/dialog.py:300
+#, fuzzy
+msgid "Message:"
+msgstr "Akce zpráv"
 
-#: ayatanawebmail/dialog.py:354
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr "Označit zprávy jako přečtené"
 
-#: ayatanawebmail/dialog.py:355
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr "Otevřít zprávu v prohlížeči/provést příkaz"
 
-#: ayatanawebmail/dialog.py:356
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr "Zeptejte se mě, co se má dělat"
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr "Povolit oznámení:"
 
-#: ayatanawebmail/dialog.py:368
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr "Přehrát zvuk při přijetí zprávy:"
 
-#: ayatanawebmail/dialog.py:370
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr "Sloučit zprávy ze stejné konverzace:"
 
-#: ayatanawebmail/dialog.py:372
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr "Skrýt počet při nule:"
 
-#: ayatanawebmail/dialog.py:374
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr "Když je zpráva aktivována:"
 
-#: ayatanawebmail/dialog.py:377
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr "Po přijetí zprávy proveďte tento příkaz:"
 
-#: ayatanawebmail/dialog.py:384
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr "Vlastní zvuk:"
 
-#: ayatanawebmail/dialog.py:400
-msgid "Report a bug/Request a feature"
+#: /ayatanawebmail/dialog.py:382
+msgid "Report a bug"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:384
+#, fuzzy
+msgid "Request a feature"
 msgstr "Nahlásit chybu / Požádat o funkci"
 
-#: ayatanawebmail/dialog.py:402
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
+#, python-brace-format
+msgid "It's a good idea to add the {labelname} label to your issue."
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:387
 msgid "Ask a question"
 msgstr "Položit otázku"
 
-#: ayatanawebmail/dialog.py:404
+#: /ayatanawebmail/dialog.py:390
 msgid "Help translate"
 msgstr "Pomozte překládat"
 
-#: ayatanawebmail/dialog.py:406
-msgid "Project page"
-msgstr "Stránka projektu"
-
-#: ayatanawebmail/dialog.py:408
+#: /ayatanawebmail/dialog.py:392
 msgid "Source code"
 msgstr "Zdrojový kód"
 
-#: ayatanawebmail/dialog.py:410
-msgid "Repository"
-msgstr "Úložiště"
-
-#: ayatanawebmail/dialog.py:412
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr "Domovská stránka"
 
-#: ayatanawebmail/dialog.py:426
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr ""
 "Milan Korecky <milan.korecky@gmail.com>\n"
 "Tomáš Marný <tomik.marny@gmail.com>"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
-msgstr "Ayatana Webmail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+#, fuzzy
+msgid "Enable notifications"
+msgstr "Povolit oznámení:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+#, fuzzy
+msgid "Play sound when new messages arrive."
+msgstr "Přehrát zvuk při přijetí zprávy:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+#, fuzzy
+msgid "Hide message count"
+msgstr "Otevřít zprávu/Spustit příkaz"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+#, fuzzy
+msgid "Run this command when new messages arrive."
+msgstr "Po přijetí zprávy proveďte tento příkaz:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+#, fuzzy
+msgid "Custom sound"
+msgstr "Vlastní zvuk:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+#, fuzzy
+msgid "Play a custom sound when new messages arrive."
+msgstr "Přehrát zvuk při přijetí zprávy:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+#, fuzzy
+msgid "Merge messages"
+msgstr "Označit zprávy jako přečtené"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+#, fuzzy
+msgid "Merge messages belonging to the same conversation."
+msgstr "Sloučit zprávy ze stejné konverzace:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+#, fuzzy
+msgid "Message action"
+msgstr "Akce zpráv"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+#, fuzzy
+msgid "Action to perform when a message is activated."
+msgstr "Když je zpráva aktivována:"
+
+#, python-brace-format
+#~ msgid "You can run \"{command}\" to delete all your login settings."
+#~ msgstr ""
+#~ "Spuštěním příkazu \"{command}\" můžete smazat všechna vaše nastavení "
+#~ "přihlášení."
+
+#~ msgid "Web page"
+#~ msgstr "Webová stránka"
+
+#~ msgid "Command"
+#~ msgstr "Příkaz"
+
+#~ msgid ""
+#~ "Please visit the following link and enable access for less secure apps:"
+#~ msgstr ""
+#~ "Navštivte následující odkaz a povolte přístup pro méně zabezpečené "
+#~ "aplikace:"
+
+#~ msgid "Access blocked by Google"
+#~ msgstr "Přístup blokovaný společností Google"
+
+#~ msgid "Choose an account"
+#~ msgstr "Vybrat účet"
+
+#~ msgid "Account data"
+#~ msgstr "Údaje o účtu"
+
+#~ msgid "Links"
+#~ msgstr "Odkazy"
+
+#~ msgid "Login:"
+#~ msgstr "Přihlašovací jméno:"
+
+#~ msgid "Project page"
+#~ msgstr "Stránka projektu"
+
+#~ msgid "Repository"
+#~ msgstr "Úložiště"
+
+#~ msgid "Ayatana Webmail"
+#~ msgstr "Ayatana Webmail"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:39
-msgid "Webmail notifications and actions for any desktop"
-msgstr "Oznámení a akce webmailu pro jakékoli pracovní prostředí"
+#~ msgid "Webmail notifications and actions for any desktop"
+#~ msgstr "Oznámení a akce webmailu pro jakékoli pracovní prostředí"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:74
-msgid "Mark all as read"
-msgstr "Označit vše jako přečtené"
+#~ msgid "Mark all as read"
+#~ msgstr "Označit vše jako přečtené"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:112
-msgid "Compose Mail"
-msgstr "Napsat e-mail"
+#~ msgid "Compose Mail"
+#~ msgstr "Napsat e-mail"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:152
-msgid "Sent"
-msgstr "Odeslané"
+#~ msgid "Sent"
+#~ msgstr "Odeslané"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:228
-msgid "Inbox"
-msgstr "Příchozí"
+#~ msgid "Inbox"
+#~ msgstr "Příchozí"
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
-msgstr "Ayatana Webmail (služba)"
+#~ msgid "Ayatana Webmail (service)"
+#~ msgstr "Ayatana Webmail (služba)"
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:38
-msgid "Display notifications about new mail"
-msgstr "Zobrazovat upozornění o novém e-mailu"
+#~ msgid "Display notifications about new mail"
+#~ msgstr "Zobrazovat upozornění o novém e-mailu"
diff --git a/po/csb.po b/po/csb.po
index 98b5914..eef78c0 100644
--- a/po/csb.po
+++ b/po/csb.po
@@ -6,9 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail 22.6.28\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/"
-"issues\n"
-"POT-Creation-Date: 2020-08-22 20:15+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -19,301 +18,330 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2;\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr ""
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr ""
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr ""
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:204
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr ""
 
-#: ayatanawebmail/application.py:211
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr ""
 
-#: ayatanawebmail/application.py:218
-#: data/usr/share/applications/ayatana-webmail.desktop:35
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr ""
 
-#: ayatanawebmail/application.py:957
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:1110
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr ""
 
-#: ayatanawebmail/application.py:1111
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
-msgid "Unable to connect to account \"{accountName}\", the application will now exit."
+msgid ""
+"Unable to connect to account \"{accountName}\", the application will now "
+"exit."
 msgstr ""
 
-#: ayatanawebmail/application.py:1136
+#: /ayatanawebmail/application.py:1131
 #, python-format
-msgid "You have %d unread mail"
-msgid_plural "You have %d unread mails"
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: ayatanawebmail/application.py:1163
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr ""
 
-#: ayatanawebmail/application.py:1165
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1167
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1180
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:60
-msgid "If this string starts with http:// or https://, the application will open it in your browser - otherwise, it will be run as a command"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:61
+msgid ""
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:90 ayatanawebmail/dialog.py:104
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:132
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:140
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:141
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:142
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:143
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:204
-msgid "Please visit the following link and enable access for less secure apps:"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:206
-msgid "Access blocked by Google"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:210
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:211
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:234
-msgid "Custom"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:242
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:244
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:286
-msgid "The application will append this string to \"Inbox\" to access a specific message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+#: /ayatanawebmail/dialog.py:276
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:288
+#: /ayatanawebmail/dialog.py:278
 msgid "Account:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:290
+#: /ayatanawebmail/dialog.py:280
 msgid "Server:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:292
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:294
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:296
+#: /ayatanawebmail/dialog.py:286
 msgid "Username:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:298
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:300
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:302
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:296
 msgid "Sent:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:308
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:310
+#: /ayatanawebmail/dialog.py:300
 msgid "Message:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:346
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:347
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:348
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:358
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:360
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:362
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:364
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:369
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:376
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:392
+#: /ayatanawebmail/dialog.py:382
 msgid "Report a bug"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:394
+#: /ayatanawebmail/dialog.py:384
 msgid "Request a feature"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:396 ayatanawebmail/dialog.py:399
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
 #, python-brace-format
 msgid "It's a good idea to add the {labelname} label to your issue."
 msgstr ""
 
-#: ayatanawebmail/dialog.py:397
+#: /ayatanawebmail/dialog.py:387
 msgid "Ask a question"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:400
+#: /ayatanawebmail/dialog.py:390
 msgid "Help translate"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:402
+#: /ayatanawebmail/dialog.py:392
 msgid "Source code"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:404
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:424
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+msgid "Enable notifications"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+msgid "Play sound when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+msgid "Hide message count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:5
-msgid "Display notifications about new mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+msgid "Run this command when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+msgid "Custom sound"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:5
-msgid "Webmail notifications and actions for any desktop"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+msgid "Play a custom sound when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:15
-msgid "Mark all as read"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+msgid "Merge messages"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:20
-msgid "Compose Mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+msgid "Merge messages belonging to the same conversation."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:25
-msgid "Sent"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+msgid "Message action"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:30
-msgid "Inbox"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+msgid "Action to perform when a message is activated."
 msgstr ""
diff --git a/po/cv.po b/po/cv.po
index 9869ab8..2e6dcc0 100644
--- a/po/cv.po
+++ b/po/cv.po
@@ -6,9 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail 22.6.28\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/"
-"issues\n"
-"POT-Creation-Date: 2020-08-22 20:15+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -18,300 +17,329 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr ""
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr ""
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr ""
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:204
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr ""
 
-#: ayatanawebmail/application.py:211
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr ""
 
-#: ayatanawebmail/application.py:218
-#: data/usr/share/applications/ayatana-webmail.desktop:35
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr ""
 
-#: ayatanawebmail/application.py:957
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:1110
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr ""
 
-#: ayatanawebmail/application.py:1111
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
-msgid "Unable to connect to account \"{accountName}\", the application will now exit."
+msgid ""
+"Unable to connect to account \"{accountName}\", the application will now "
+"exit."
 msgstr ""
 
-#: ayatanawebmail/application.py:1136
+#: /ayatanawebmail/application.py:1131
 #, python-format
-msgid "You have %d unread mail"
-msgid_plural "You have %d unread mails"
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ayatanawebmail/application.py:1163
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr ""
 
-#: ayatanawebmail/application.py:1165
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1167
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1180
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:60
-msgid "If this string starts with http:// or https://, the application will open it in your browser - otherwise, it will be run as a command"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:61
+msgid ""
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:90 ayatanawebmail/dialog.py:104
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:132
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:140
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:141
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:142
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:143
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:204
-msgid "Please visit the following link and enable access for less secure apps:"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:206
-msgid "Access blocked by Google"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:210
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:211
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:234
-msgid "Custom"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:242
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:244
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:286
-msgid "The application will append this string to \"Inbox\" to access a specific message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+#: /ayatanawebmail/dialog.py:276
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:288
+#: /ayatanawebmail/dialog.py:278
 msgid "Account:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:290
+#: /ayatanawebmail/dialog.py:280
 msgid "Server:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:292
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:294
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:296
+#: /ayatanawebmail/dialog.py:286
 msgid "Username:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:298
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:300
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:302
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:296
 msgid "Sent:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:308
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:310
+#: /ayatanawebmail/dialog.py:300
 msgid "Message:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:346
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:347
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:348
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:358
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:360
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:362
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:364
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:369
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:376
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:392
+#: /ayatanawebmail/dialog.py:382
 msgid "Report a bug"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:394
+#: /ayatanawebmail/dialog.py:384
 msgid "Request a feature"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:396 ayatanawebmail/dialog.py:399
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
 #, python-brace-format
 msgid "It's a good idea to add the {labelname} label to your issue."
 msgstr ""
 
-#: ayatanawebmail/dialog.py:397
+#: /ayatanawebmail/dialog.py:387
 msgid "Ask a question"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:400
+#: /ayatanawebmail/dialog.py:390
 msgid "Help translate"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:402
+#: /ayatanawebmail/dialog.py:392
 msgid "Source code"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:404
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:424
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+msgid "Enable notifications"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+msgid "Play sound when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+msgid "Hide message count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:5
-msgid "Display notifications about new mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+msgid "Run this command when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+msgid "Custom sound"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:5
-msgid "Webmail notifications and actions for any desktop"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+msgid "Play a custom sound when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:15
-msgid "Mark all as read"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+msgid "Merge messages"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:20
-msgid "Compose Mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+msgid "Merge messages belonging to the same conversation."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:25
-msgid "Sent"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+msgid "Message action"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:30
-msgid "Inbox"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+msgid "Action to perform when a message is activated."
 msgstr ""
diff --git a/po/cy.po b/po/cy.po
index 647d9da..1fbbdcc 100755
--- a/po/cy.po
+++ b/po/cy.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/issues\n"
-"POT-Creation-Date: 2020-04-03 12:21+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: 2018-06-04 07:33+0000\n"
 "Language-Team: Welsh <cy@li.org>\n"
+"Language: cy\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,282 +19,343 @@ msgstr ""
 "X-Launchpad-Export-Date: 2020-04-04 05:58+0000\n"
 "X-Generator: Launchpad (build a296f04231dee355be5db73cc878b9e21689a253)\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr ""
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr ""
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr ""
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:205
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr ""
 
-#: ayatanawebmail/application.py:212
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr ""
 
-#: ayatanawebmail/application.py:219
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr ""
 
-#: ayatanawebmail/application.py:980
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr "Dim pwnc"
 
-#: ayatanawebmail/application.py:1132
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr ""
 
-#: ayatanawebmail/application.py:1133
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
 msgid ""
 "Unable to connect to account \"{accountName}\", the application will now "
 "exit."
 msgstr ""
 
-#: ayatanawebmail/application.py:1133
-#, python-brace-format
-msgid "You can run \"{command}\" to delete all your login settings."
-msgstr ""
-
-#: ayatanawebmail/application.py:1158
-#, python-format
-msgid "You have %d unread mail"
-msgid_plural "You have %d unread mails"
+#: /ayatanawebmail/application.py:1131
+#, fuzzy, python-format
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
 msgstr[0] "Mae gennych %d ebost heb ei darllen"
 msgstr[1] "Mae gennych %d ebost heb eu darllen"
 msgstr[2] "Mae gennych %d ebost heb eu darllen"
 msgstr[3] "Mae gennych %d ebost heb eu darllen"
 
-#: ayatanawebmail/application.py:1185
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr ""
 
-#: ayatanawebmail/application.py:1187
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1189
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1202
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr "Ebost newydd wrth %s"
 
-#: ayatanawebmail/dialog.py:60
-msgid "Web page"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:61
-msgid "Command"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:93
+#: /ayatanawebmail/dialog.py:61
 msgid ""
-"Append an additional string - you can use the $MSG_THREAD and $MSG_UID "
-"placeholders."
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:114 ayatanawebmail/dialog.py:128
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:156
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr "Dewisiadau Ayatana Webmail"
 
-#: ayatanawebmail/dialog.py:164
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr "Cyfrifon"
 
-#: ayatanawebmail/dialog.py:165
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr "Opsiynau"
 
-#: ayatanawebmail/dialog.py:166
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:167
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:228
-msgid ""
-"Please visit the following link and enable access for less secure apps:"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:230
-msgid "Access blocked by Google"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:234
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:235
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:254
-msgid "Choose an account"
-msgstr "Dewis cyfrif"
-
-#: ayatanawebmail/dialog.py:259
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:261
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:276
-msgid "Server data"
-msgstr "Gwybodaeth gweinydd"
+#: /ayatanawebmail/dialog.py:276
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+msgstr ""
 
-#: ayatanawebmail/dialog.py:278
-msgid "Account data"
-msgstr "Gwybodaeth cyfrif"
+#: /ayatanawebmail/dialog.py:278
+#, fuzzy
+msgid "Account:"
+msgstr "Cyfrifon"
 
-#: ayatanawebmail/dialog.py:289
-msgid "Links"
-msgstr ""
+#: /ayatanawebmail/dialog.py:280
+#, fuzzy
+msgid "Server:"
+msgstr "Gwybodaeth gweinydd"
 
-#: ayatanawebmail/dialog.py:297
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr "Gwesteiwr:"
 
-#: ayatanawebmail/dialog.py:299
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr "Porth:"
 
-#: ayatanawebmail/dialog.py:302
-msgid "Login:"
-msgstr "Mewngofnodi:"
+#: /ayatanawebmail/dialog.py:286
+msgid "Username:"
+msgstr ""
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr "Cyfrinair:"
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:309
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr "Careref:"
 
-#: ayatanawebmail/dialog.py:311
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr "Ysgrifennu:"
 
-#: ayatanawebmail/dialog.py:313
+#: /ayatanawebmail/dialog.py:296
+msgid "Sent:"
+msgstr "Anfonwyd:"
+
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr "Mewnflwch:"
 
-#: ayatanawebmail/dialog.py:316
-msgid "Sent:"
-msgstr "Anfonwyd:"
+#: /ayatanawebmail/dialog.py:300
+msgid "Message:"
+msgstr ""
 
-#: ayatanawebmail/dialog.py:354
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:355
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:356
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr "Galluogi hysbysiadau:"
 
-#: ayatanawebmail/dialog.py:368
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:370
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:372
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:374
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:377
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:384
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:400
-msgid "Report a bug/Request a feature"
+#: /ayatanawebmail/dialog.py:382
+msgid "Report a bug"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:402
-msgid "Ask a question"
+#: /ayatanawebmail/dialog.py:384
+msgid "Request a feature"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:404
-msgid "Help translate"
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
+#, python-brace-format
+msgid "It's a good idea to add the {labelname} label to your issue."
 msgstr ""
 
-#: ayatanawebmail/dialog.py:406
-msgid "Project page"
+#: /ayatanawebmail/dialog.py:387
+msgid "Ask a question"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:408
-msgid "Source code"
+#: /ayatanawebmail/dialog.py:390
+msgid "Help translate"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:410
-msgid "Repository"
+#: /ayatanawebmail/dialog.py:392
+msgid "Source code"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:412
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:426
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+#, fuzzy
+msgid "Enable notifications"
+msgstr "Galluogi hysbysiadau:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+msgid "Play sound when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+msgid "Hide message count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+msgid "Run this command when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+msgid "Custom sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+msgid "Play a custom sound when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+msgid "Merge messages"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+msgid "Merge messages belonging to the same conversation."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+msgid "Message action"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+msgid "Action to perform when a message is activated."
+msgstr ""
+
+#~ msgid "Choose an account"
+#~ msgstr "Dewis cyfrif"
+
+#~ msgid "Account data"
+#~ msgstr "Gwybodaeth cyfrif"
+
+#~ msgid "Login:"
+#~ msgstr "Mewngofnodi:"
diff --git a/po/da.po b/po/da.po
index be7c954..d4c4b5f 100644
--- a/po/da.po
+++ b/po/da.po
@@ -6,9 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail 22.6.28\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/"
-"issues\n"
-"POT-Creation-Date: 2020-08-22 20:15+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -18,300 +17,329 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr ""
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr ""
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr ""
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:204
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr ""
 
-#: ayatanawebmail/application.py:211
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr ""
 
-#: ayatanawebmail/application.py:218
-#: data/usr/share/applications/ayatana-webmail.desktop:35
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr ""
 
-#: ayatanawebmail/application.py:957
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:1110
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr ""
 
-#: ayatanawebmail/application.py:1111
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
-msgid "Unable to connect to account \"{accountName}\", the application will now exit."
+msgid ""
+"Unable to connect to account \"{accountName}\", the application will now "
+"exit."
 msgstr ""
 
-#: ayatanawebmail/application.py:1136
+#: /ayatanawebmail/application.py:1131
 #, python-format
-msgid "You have %d unread mail"
-msgid_plural "You have %d unread mails"
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ayatanawebmail/application.py:1163
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr ""
 
-#: ayatanawebmail/application.py:1165
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1167
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1180
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:60
-msgid "If this string starts with http:// or https://, the application will open it in your browser - otherwise, it will be run as a command"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:61
+msgid ""
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:90 ayatanawebmail/dialog.py:104
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:132
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:140
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:141
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:142
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:143
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:204
-msgid "Please visit the following link and enable access for less secure apps:"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:206
-msgid "Access blocked by Google"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:210
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:211
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:234
-msgid "Custom"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:242
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:244
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:286
-msgid "The application will append this string to \"Inbox\" to access a specific message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+#: /ayatanawebmail/dialog.py:276
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:288
+#: /ayatanawebmail/dialog.py:278
 msgid "Account:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:290
+#: /ayatanawebmail/dialog.py:280
 msgid "Server:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:292
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:294
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:296
+#: /ayatanawebmail/dialog.py:286
 msgid "Username:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:298
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:300
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:302
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:296
 msgid "Sent:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:308
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:310
+#: /ayatanawebmail/dialog.py:300
 msgid "Message:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:346
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:347
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:348
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:358
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:360
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:362
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:364
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:369
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:376
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:392
+#: /ayatanawebmail/dialog.py:382
 msgid "Report a bug"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:394
+#: /ayatanawebmail/dialog.py:384
 msgid "Request a feature"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:396 ayatanawebmail/dialog.py:399
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
 #, python-brace-format
 msgid "It's a good idea to add the {labelname} label to your issue."
 msgstr ""
 
-#: ayatanawebmail/dialog.py:397
+#: /ayatanawebmail/dialog.py:387
 msgid "Ask a question"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:400
+#: /ayatanawebmail/dialog.py:390
 msgid "Help translate"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:402
+#: /ayatanawebmail/dialog.py:392
 msgid "Source code"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:404
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:424
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+msgid "Enable notifications"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+msgid "Play sound when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+msgid "Hide message count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:5
-msgid "Display notifications about new mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+msgid "Run this command when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+msgid "Custom sound"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:5
-msgid "Webmail notifications and actions for any desktop"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+msgid "Play a custom sound when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:15
-msgid "Mark all as read"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+msgid "Merge messages"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:20
-msgid "Compose Mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+msgid "Merge messages belonging to the same conversation."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:25
-msgid "Sent"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+msgid "Message action"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:30
-msgid "Inbox"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+msgid "Action to perform when a message is activated."
 msgstr ""
diff --git a/po/de.po b/po/de.po
index f3c3b13..2f8a04c 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,13 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/"
-"issues\n"
-"POT-Creation-Date: 2020-04-03 12:21+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: 2021-02-23 00:50+0000\n"
 "Last-Translator: J. Lavoie <j.lavoie@net-c.ca>\n"
-"Language-Team: German <https://hosted.weblate.org/projects/"
-"ayatana-indicators/ayatana-webmail/de/>\n"
+"Language-Team: German <https://hosted.weblate.org/projects/ayatana-"
+"indicators/ayatana-webmail/de/>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,59 +20,59 @@ msgstr ""
 "X-Generator: Weblate 4.5\n"
 "X-Launchpad-Export-Date: 2020-04-04 05:58+0000\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr "Konto auswählen"
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr "Welche(n) Kontobefehl/-Seite möchten Sie öffnen?"
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr "Nachrichtenaktionen"
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr "Löschen"
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr "Als gelesen markieren"
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr "Nachricht öffnen / Befehl ausführen"
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr "Absender"
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr "Betreff"
 
-#: ayatanawebmail/application.py:205
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr "Webmail-Startseite öffnen"
 
-#: ayatanawebmail/application.py:212
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr "Löschen"
 
-#: ayatanawebmail/application.py:219
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: ayatanawebmail/application.py:980
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr "Kein Betreff"
 
-#: ayatanawebmail/application.py:1132
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr "Verbindungsfehler"
 
-#: ayatanawebmail/application.py:1133
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
 msgid ""
 "Unable to connect to account \"{accountName}\", the application will now "
@@ -82,227 +81,215 @@ msgstr ""
 "Zu Konto »{accountName}« kann nicht verbunden werden, die Anwendung wird "
 "jetzt beendet."
 
-#: ayatanawebmail/application.py:1133
-#, python-brace-format
-msgid "You can run \"{command}\" to delete all your login settings."
-msgstr "Sie können »{command}« ausführen, um alle Anmeldedaten zu löschen."
-
-#: ayatanawebmail/application.py:1158
-#, python-format
-msgid "You have %d unread mail"
-msgid_plural "You have %d unread mails"
+#: /ayatanawebmail/application.py:1131
+#, fuzzy, python-format
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
 msgstr[0] "Sie haben %d ungelesene Nachricht"
 msgstr[1] "Sie haben %d ungelesene Nachrichten"
 
-#: ayatanawebmail/application.py:1185
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr "von %(t0)s, %(t1)s und anderen"
 
-#: ayatanawebmail/application.py:1187
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr "von %(t0)s und %(t1)s"
 
-#: ayatanawebmail/application.py:1189
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr "von %s"
 
-#: ayatanawebmail/application.py:1202
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr "Neue E-Mail von %s"
 
-#: ayatanawebmail/dialog.py:60
-msgid "Web page"
-msgstr "Internetseite"
-
-#: ayatanawebmail/dialog.py:61
-msgid "Command"
-msgstr "Befehl"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
+msgstr ""
 
-#: ayatanawebmail/dialog.py:93
+#: /ayatanawebmail/dialog.py:61
 msgid ""
-"Append an additional string - you can use the $MSG_THREAD and $MSG_UID "
-"placeholders."
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
-"Eine zusätzliche Zeichenkette anhängen - $MSG_THREAD und $MSG_UID können als "
-"Platzhalter verwendet werden."
 
-#: ayatanawebmail/dialog.py:114 ayatanawebmail/dialog.py:128
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr "(–––)"
 
-#: ayatanawebmail/dialog.py:156
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr "Ayatana-Webmail-Einstellungen"
 
-#: ayatanawebmail/dialog.py:164
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr "Konten"
 
-#: ayatanawebmail/dialog.py:165
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr "Optionen"
 
-#: ayatanawebmail/dialog.py:166
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr "Unterstützung"
 
-#: ayatanawebmail/dialog.py:167
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr "Über"
 
-#: ayatanawebmail/dialog.py:228
-msgid ""
-"Please visit the following link and enable access for less secure apps:"
-msgstr ""
-"Bitte besuchen Sie den folgenden Verweis und aktivieren Sie den Zugriff für "
-"weniger sichere Anwendungen:"
-
-#: ayatanawebmail/dialog.py:230
-msgid "Access blocked by Google"
-msgstr "Zugriff durch Google gesperrt"
-
-#: ayatanawebmail/dialog.py:234
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr ""
 "Verbindung zum E-Mail-Konto fehlgeschlagen. Der zurückgegebene Fehler war:"
 
-#: ayatanawebmail/dialog.py:235
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr "Verbindungsfehler"
 
-#: ayatanawebmail/dialog.py:254
-msgid "Choose an account"
-msgstr "Konto auswählen"
-
-#: ayatanawebmail/dialog.py:259
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr "Hinzufügen"
 
-#: ayatanawebmail/dialog.py:261
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr "Entfernen"
 
-#: ayatanawebmail/dialog.py:276
-msgid "Server data"
-msgstr "Serverdaten"
+#: /ayatanawebmail/dialog.py:276
+#, fuzzy
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+msgstr ""
+"Eine zusätzliche Zeichenkette anhängen - $MSG_THREAD und $MSG_UID können als "
+"Platzhalter verwendet werden."
 
-#: ayatanawebmail/dialog.py:278
-msgid "Account data"
-msgstr "Kontodaten"
+#: /ayatanawebmail/dialog.py:278
+#, fuzzy
+msgid "Account:"
+msgstr "Konten"
 
-#: ayatanawebmail/dialog.py:289
-msgid "Links"
-msgstr "Verknüpfungen"
+#: /ayatanawebmail/dialog.py:280
+#, fuzzy
+msgid "Server:"
+msgstr "Serverdaten"
 
-#: ayatanawebmail/dialog.py:297
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr "Host:"
 
-#: ayatanawebmail/dialog.py:299
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr "Port:"
 
-#: ayatanawebmail/dialog.py:302
-msgid "Login:"
-msgstr "Benutzername:"
+#: /ayatanawebmail/dialog.py:286
+msgid "Username:"
+msgstr ""
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr "Passwort:"
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr "Ordner:"
 
-#: ayatanawebmail/dialog.py:309
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr "Privat:"
 
-#: ayatanawebmail/dialog.py:311
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr "Erstellen:"
 
-#: ayatanawebmail/dialog.py:313
+#: /ayatanawebmail/dialog.py:296
+msgid "Sent:"
+msgstr "Gesendet:"
+
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr "Posteingang:"
 
-#: ayatanawebmail/dialog.py:316
-msgid "Sent:"
-msgstr "Gesendet:"
+#: /ayatanawebmail/dialog.py:300
+#, fuzzy
+msgid "Message:"
+msgstr "Nachrichtenaktionen"
 
-#: ayatanawebmail/dialog.py:354
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr "Nachrichten als gelesen markieren"
 
-#: ayatanawebmail/dialog.py:355
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr "Nachricht im Browser öffnen / Befehl ausführen"
 
-#: ayatanawebmail/dialog.py:356
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr "Fragen was zu tun ist"
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr "Benachrichtigungen aktivieren:"
 
-#: ayatanawebmail/dialog.py:368
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr "Klang bei Eingang einer Nachricht abspielen:"
 
-#: ayatanawebmail/dialog.py:370
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr "Nachrichten aus derselben Konversation zusammenführen:"
 
-#: ayatanawebmail/dialog.py:372
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr "Anzahl verstecken wenn Null:"
 
-#: ayatanawebmail/dialog.py:374
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr "Wenn eine Nachricht aktiviert ist:"
 
-#: ayatanawebmail/dialog.py:377
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr "Dieses Kommando bei Eingang einer Nachricht ausführen:"
 
-#: ayatanawebmail/dialog.py:384
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr "Benutzerdefinierter Ton zum Abspielen:"
 
-#: ayatanawebmail/dialog.py:400
-msgid "Report a bug/Request a feature"
+#: /ayatanawebmail/dialog.py:382
+msgid "Report a bug"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:384
+#, fuzzy
+msgid "Request a feature"
 msgstr "Einen Fehler melden / Eine Funktion anfragen"
 
-#: ayatanawebmail/dialog.py:402
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
+#, python-brace-format
+msgid "It's a good idea to add the {labelname} label to your issue."
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:387
 msgid "Ask a question"
 msgstr "Eine Frage stellen"
 
-#: ayatanawebmail/dialog.py:404
+#: /ayatanawebmail/dialog.py:390
 msgid "Help translate"
 msgstr "Übersetzen helfen"
 
-#: ayatanawebmail/dialog.py:406
-msgid "Project page"
-msgstr "Projektseite"
-
-#: ayatanawebmail/dialog.py:408
+#: /ayatanawebmail/dialog.py:392
 msgid "Source code"
 msgstr "Quelltext"
 
-#: ayatanawebmail/dialog.py:410
-msgid "Repository"
-msgstr "Paketquelle"
-
-#: ayatanawebmail/dialog.py:412
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr "Startseite"
 
-#: ayatanawebmail/dialog.py:426
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -311,34 +298,137 @@ msgstr ""
 "Hosted Weblate Contributions:\n"
 "  Mike Gabriel <mike.gabriel@das-netzwerkteam.de>"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
-msgstr "Ayatana-Webmail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+#, fuzzy
+msgid "Enable notifications"
+msgstr "Benachrichtigungen aktivieren:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+#, fuzzy
+msgid "Play sound when new messages arrive."
+msgstr "Klang bei Eingang einer Nachricht abspielen:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+#, fuzzy
+msgid "Hide message count"
+msgstr "Nachricht öffnen / Befehl ausführen"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+#, fuzzy
+msgid "Run this command when new messages arrive."
+msgstr "Dieses Kommando bei Eingang einer Nachricht ausführen:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+#, fuzzy
+msgid "Custom sound"
+msgstr "Benutzerdefinierter Ton zum Abspielen:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+#, fuzzy
+msgid "Play a custom sound when new messages arrive."
+msgstr "Klang bei Eingang einer Nachricht abspielen:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+#, fuzzy
+msgid "Merge messages"
+msgstr "Nachrichten als gelesen markieren"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+#, fuzzy
+msgid "Merge messages belonging to the same conversation."
+msgstr "Nachrichten aus derselben Konversation zusammenführen:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+#, fuzzy
+msgid "Message action"
+msgstr "Nachrichtenaktionen"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+#, fuzzy
+msgid "Action to perform when a message is activated."
+msgstr "Wenn eine Nachricht aktiviert ist:"
+
+#, python-brace-format
+#~ msgid "You can run \"{command}\" to delete all your login settings."
+#~ msgstr "Sie können »{command}« ausführen, um alle Anmeldedaten zu löschen."
+
+#~ msgid "Web page"
+#~ msgstr "Internetseite"
+
+#~ msgid "Command"
+#~ msgstr "Befehl"
+
+#~ msgid ""
+#~ "Please visit the following link and enable access for less secure apps:"
+#~ msgstr ""
+#~ "Bitte besuchen Sie den folgenden Verweis und aktivieren Sie den Zugriff "
+#~ "für weniger sichere Anwendungen:"
+
+#~ msgid "Access blocked by Google"
+#~ msgstr "Zugriff durch Google gesperrt"
+
+#~ msgid "Choose an account"
+#~ msgstr "Konto auswählen"
+
+#~ msgid "Account data"
+#~ msgstr "Kontodaten"
+
+#~ msgid "Links"
+#~ msgstr "Verknüpfungen"
+
+#~ msgid "Login:"
+#~ msgstr "Benutzername:"
+
+#~ msgid "Project page"
+#~ msgstr "Projektseite"
+
+#~ msgid "Repository"
+#~ msgstr "Paketquelle"
+
+#~ msgid "Ayatana Webmail"
+#~ msgstr "Ayatana-Webmail"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:39
-msgid "Webmail notifications and actions for any desktop"
-msgstr "Webmail-Benachrichtigungen und -Aktionen für beliebige Desktops"
+#~ msgid "Webmail notifications and actions for any desktop"
+#~ msgstr "Webmail-Benachrichtigungen und -Aktionen für beliebige Desktops"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:74
-msgid "Mark all as read"
-msgstr "Alle als gelesen markieren"
+#~ msgid "Mark all as read"
+#~ msgstr "Alle als gelesen markieren"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:112
-msgid "Compose Mail"
-msgstr "Verfassen"
+#~ msgid "Compose Mail"
+#~ msgstr "Verfassen"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:152
-msgid "Sent"
-msgstr "Gesendet"
+#~ msgid "Sent"
+#~ msgstr "Gesendet"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:228
-msgid "Inbox"
-msgstr "Posteingang"
+#~ msgid "Inbox"
+#~ msgstr "Posteingang"
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
-msgstr "Ayatana Webmail (Dienst)"
+#~ msgid "Ayatana Webmail (service)"
+#~ msgstr "Ayatana Webmail (Dienst)"
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:38
-msgid "Display notifications about new mail"
-msgstr "Benachrichtigungen bei neuen E-Mails anzeigen"
+#~ msgid "Display notifications about new mail"
+#~ msgstr "Benachrichtigungen bei neuen E-Mails anzeigen"
diff --git a/po/dv.po b/po/dv.po
index baefacd..03bfd67 100644
--- a/po/dv.po
+++ b/po/dv.po
@@ -6,9 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail 22.6.28\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/"
-"issues\n"
-"POT-Creation-Date: 2020-08-22 20:15+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -18,300 +17,329 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr ""
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr ""
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr ""
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:204
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr ""
 
-#: ayatanawebmail/application.py:211
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr ""
 
-#: ayatanawebmail/application.py:218
-#: data/usr/share/applications/ayatana-webmail.desktop:35
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr ""
 
-#: ayatanawebmail/application.py:957
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:1110
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr ""
 
-#: ayatanawebmail/application.py:1111
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
-msgid "Unable to connect to account \"{accountName}\", the application will now exit."
+msgid ""
+"Unable to connect to account \"{accountName}\", the application will now "
+"exit."
 msgstr ""
 
-#: ayatanawebmail/application.py:1136
+#: /ayatanawebmail/application.py:1131
 #, python-format
-msgid "You have %d unread mail"
-msgid_plural "You have %d unread mails"
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ayatanawebmail/application.py:1163
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr ""
 
-#: ayatanawebmail/application.py:1165
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1167
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1180
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:60
-msgid "If this string starts with http:// or https://, the application will open it in your browser - otherwise, it will be run as a command"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:61
+msgid ""
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:90 ayatanawebmail/dialog.py:104
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:132
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:140
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:141
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:142
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:143
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:204
-msgid "Please visit the following link and enable access for less secure apps:"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:206
-msgid "Access blocked by Google"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:210
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:211
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:234
-msgid "Custom"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:242
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:244
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:286
-msgid "The application will append this string to \"Inbox\" to access a specific message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+#: /ayatanawebmail/dialog.py:276
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:288
+#: /ayatanawebmail/dialog.py:278
 msgid "Account:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:290
+#: /ayatanawebmail/dialog.py:280
 msgid "Server:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:292
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:294
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:296
+#: /ayatanawebmail/dialog.py:286
 msgid "Username:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:298
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:300
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:302
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:296
 msgid "Sent:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:308
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:310
+#: /ayatanawebmail/dialog.py:300
 msgid "Message:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:346
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:347
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:348
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:358
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:360
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:362
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:364
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:369
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:376
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:392
+#: /ayatanawebmail/dialog.py:382
 msgid "Report a bug"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:394
+#: /ayatanawebmail/dialog.py:384
 msgid "Request a feature"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:396 ayatanawebmail/dialog.py:399
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
 #, python-brace-format
 msgid "It's a good idea to add the {labelname} label to your issue."
 msgstr ""
 
-#: ayatanawebmail/dialog.py:397
+#: /ayatanawebmail/dialog.py:387
 msgid "Ask a question"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:400
+#: /ayatanawebmail/dialog.py:390
 msgid "Help translate"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:402
+#: /ayatanawebmail/dialog.py:392
 msgid "Source code"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:404
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:424
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+msgid "Enable notifications"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+msgid "Play sound when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+msgid "Hide message count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:5
-msgid "Display notifications about new mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+msgid "Run this command when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+msgid "Custom sound"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:5
-msgid "Webmail notifications and actions for any desktop"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+msgid "Play a custom sound when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:15
-msgid "Mark all as read"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+msgid "Merge messages"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:20
-msgid "Compose Mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+msgid "Merge messages belonging to the same conversation."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:25
-msgid "Sent"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+msgid "Message action"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:30
-msgid "Inbox"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+msgid "Action to perform when a message is activated."
 msgstr ""
diff --git a/po/el.po b/po/el.po
index 029bb5f..b1f33f5 100644
--- a/po/el.po
+++ b/po/el.po
@@ -6,9 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/"
-"issues\n"
-"POT-Creation-Date: 2020-04-03 12:21+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: 2021-02-05 23:41+0000\n"
 "Last-Translator: Michalis <michalisntovas@yahoo.gr>\n"
 "Language-Team: Greek <https://hosted.weblate.org/projects/ayatana-indicators/"
@@ -21,312 +20,354 @@ msgstr ""
 "X-Generator: Weblate 4.5-dev\n"
 "X-Launchpad-Export-Date: 2020-04-04 05:58+0000\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr ""
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr ""
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr ""
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:205
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr ""
 
-#: ayatanawebmail/application.py:212
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr ""
 
-#: ayatanawebmail/application.py:219
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr ""
 
-#: ayatanawebmail/application.py:980
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr "Χωρίς θέμα"
 
-#: ayatanawebmail/application.py:1132
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr ""
 
-#: ayatanawebmail/application.py:1133
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
 msgid ""
 "Unable to connect to account \"{accountName}\", the application will now "
 "exit."
 msgstr ""
 
-#: ayatanawebmail/application.py:1133
-#, python-brace-format
-msgid "You can run \"{command}\" to delete all your login settings."
-msgstr ""
-
-#: ayatanawebmail/application.py:1158
-#, python-format
-msgid "You have %d unread mail"
-msgid_plural "You have %d unread mails"
+#: /ayatanawebmail/application.py:1131
+#, fuzzy, python-format
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
 msgstr[0] "Έχετε  %d αδιάβαστο μήνυμα"
 msgstr[1] "Έχετε  %d αδιάβαστα μηνύματα"
 
-#: ayatanawebmail/application.py:1185
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr "Από %(t0)s, %(t1)s και άλλα"
 
-#: ayatanawebmail/application.py:1187
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr "από %(t0)s and %(t1)s"
 
-#: ayatanawebmail/application.py:1189
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr "από  %s"
 
-#: ayatanawebmail/application.py:1202
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr "Νέο μήνυμα από %s"
 
-#: ayatanawebmail/dialog.py:60
-msgid "Web page"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:61
-msgid "Command"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:93
+#: /ayatanawebmail/dialog.py:61
 msgid ""
-"Append an additional string - you can use the $MSG_THREAD and $MSG_UID "
-"placeholders."
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:114 ayatanawebmail/dialog.py:128
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:156
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr "Προτιμήσεις Ayatana Webmail"
 
-#: ayatanawebmail/dialog.py:164
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr "Λογαριασμοί"
 
-#: ayatanawebmail/dialog.py:165
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr "Προτιμήσεις"
 
-#: ayatanawebmail/dialog.py:166
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:167
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:228
-msgid ""
-"Please visit the following link and enable access for less secure apps:"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:230
-msgid "Access blocked by Google"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:234
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:235
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:254
-msgid "Choose an account"
-msgstr "Επιλέξτε έναν λογαριασμό"
-
-#: ayatanawebmail/dialog.py:259
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:261
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:276
-msgid "Server data"
-msgstr "Στοιχεία διακομιστή"
+#: /ayatanawebmail/dialog.py:276
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+msgstr ""
 
-#: ayatanawebmail/dialog.py:278
-msgid "Account data"
-msgstr "Στοιχεία λογαριασμού"
+#: /ayatanawebmail/dialog.py:278
+#, fuzzy
+msgid "Account:"
+msgstr "Λογαριασμοί"
 
-#: ayatanawebmail/dialog.py:289
-msgid "Links"
-msgstr ""
+#: /ayatanawebmail/dialog.py:280
+#, fuzzy
+msgid "Server:"
+msgstr "Στοιχεία διακομιστή"
 
-#: ayatanawebmail/dialog.py:297
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr "Εξυπηρετητής:"
 
-#: ayatanawebmail/dialog.py:299
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr "Θύρα:"
 
-#: ayatanawebmail/dialog.py:302
-msgid "Login:"
-msgstr "Είσοδος:"
+#: /ayatanawebmail/dialog.py:286
+msgid "Username:"
+msgstr ""
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr "Κωδικός πρόσβασης:"
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:309
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr "Αρχική:"
 
-#: ayatanawebmail/dialog.py:311
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr "Σύνθεση:"
 
-#: ayatanawebmail/dialog.py:313
+#: /ayatanawebmail/dialog.py:296
+msgid "Sent:"
+msgstr "Απεσταλμένα:"
+
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr "Εισερχόμενα:"
 
-#: ayatanawebmail/dialog.py:316
-msgid "Sent:"
-msgstr "Απεσταλμένα:"
+#: /ayatanawebmail/dialog.py:300
+msgid "Message:"
+msgstr ""
 
-#: ayatanawebmail/dialog.py:354
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:355
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:356
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr "Ενεργοποίηση ειδοποιήσεων:"
 
-#: ayatanawebmail/dialog.py:368
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:370
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:372
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:374
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:377
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:384
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr "Επιλογή ήχου προς αναπαραγωγή:"
 
-#: ayatanawebmail/dialog.py:400
-msgid "Report a bug/Request a feature"
+#: /ayatanawebmail/dialog.py:382
+msgid "Report a bug"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:402
-msgid "Ask a question"
+#: /ayatanawebmail/dialog.py:384
+msgid "Request a feature"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:404
-msgid "Help translate"
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
+#, python-brace-format
+msgid "It's a good idea to add the {labelname} label to your issue."
 msgstr ""
 
-#: ayatanawebmail/dialog.py:406
-msgid "Project page"
+#: /ayatanawebmail/dialog.py:387
+msgid "Ask a question"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:408
-msgid "Source code"
+#: /ayatanawebmail/dialog.py:390
+msgid "Help translate"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:410
-msgid "Repository"
+#: /ayatanawebmail/dialog.py:392
+msgid "Source code"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:412
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:426
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:39
-msgid "Webmail notifications and actions for any desktop"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+#, fuzzy
+msgid "Enable notifications"
+msgstr "Ενεργοποίηση ειδοποιήσεων:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:74
-msgid "Mark all as read"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:112
-msgid "Compose Mail"
-msgstr "Σύνθεση ηλεκτρονικού μηνύματος"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+msgid "Play sound when new messages arrive."
+msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:152
-msgid "Sent"
-msgstr "Απεσταλμένα"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+msgid "Hide message count"
+msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:228
-msgid "Inbox"
-msgstr "Εισερχόμενα"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+msgid "Run this command when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+#, fuzzy
+msgid "Custom sound"
+msgstr "Επιλογή ήχου προς αναπαραγωγή:"
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+msgid "Play a custom sound when new messages arrive."
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:38
-msgid "Display notifications about new mail"
-msgstr "Εμφάνιση ειδοποιήσεων για νέα μηνύματα"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+msgid "Merge messages"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+msgid "Merge messages belonging to the same conversation."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+msgid "Message action"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+msgid "Action to perform when a message is activated."
+msgstr ""
+
+#~ msgid "Choose an account"
+#~ msgstr "Επιλέξτε έναν λογαριασμό"
+
+#~ msgid "Account data"
+#~ msgstr "Στοιχεία λογαριασμού"
+
+#~ msgid "Login:"
+#~ msgstr "Είσοδος:"
+
+#~ msgid "Compose Mail"
+#~ msgstr "Σύνθεση ηλεκτρονικού μηνύματος"
+
+#~ msgid "Sent"
+#~ msgstr "Απεσταλμένα"
+
+#~ msgid "Inbox"
+#~ msgstr "Εισερχόμενα"
+
+#~ msgid "Display notifications about new mail"
+#~ msgstr "Εμφάνιση ειδοποιήσεων για νέα μηνύματα"
diff --git a/po/en_AU.po b/po/en_AU.po
index c7ce4c1..08ab29d 100644
--- a/po/en_AU.po
+++ b/po/en_AU.po
@@ -6,9 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/"
-"issues\n"
-"POT-Creation-Date: 2020-04-03 12:21+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: 2020-10-11 16:26+0000\n"
 "Last-Translator: Rob Pearson <rob.dunedin@gmail.com>\n"
 "Language-Team: English (Australia) <https://hosted.weblate.org/projects/"
@@ -21,59 +20,59 @@ msgstr ""
 "X-Generator: Weblate 4.3-dev\n"
 "X-Launchpad-Export-Date: 2020-04-04 05:58+0000\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr "Select account"
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr "Which account's command/web page would you like to open?"
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr "Message actions"
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr "Delete"
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr "Mark as read"
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr "Open message/Run command"
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr "Sender"
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr "Subject"
 
-#: ayatanawebmail/application.py:205
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr "Open webmail home page"
 
-#: ayatanawebmail/application.py:212
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr "Clear"
 
-#: ayatanawebmail/application.py:219
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr "Settings"
 
-#: ayatanawebmail/application.py:980
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr "No subject"
 
-#: ayatanawebmail/application.py:1132
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr "Connection error"
 
-#: ayatanawebmail/application.py:1133
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
 msgid ""
 "Unable to connect to account \"{accountName}\", the application will now "
@@ -82,255 +81,347 @@ msgstr ""
 "Unable to connect to account \"{accountName}\", the application will now "
 "exit."
 
-#: ayatanawebmail/application.py:1133
-#, python-brace-format
-msgid "You can run \"{command}\" to delete all your login settings."
-msgstr "You can run \"{command}\" to delete all your login settings."
-
-#: ayatanawebmail/application.py:1158
-#, python-format
-msgid "You have %d unread mail"
-msgid_plural "You have %d unread mails"
+#: /ayatanawebmail/application.py:1131
+#, fuzzy, python-format
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
 msgstr[0] "You have %d unread mail"
 msgstr[1] "You have %d unread mails"
 
-#: ayatanawebmail/application.py:1185
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr "from %(t0)s, %(t1)s and others"
 
-#: ayatanawebmail/application.py:1187
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr "from %(t0)s and %(t1)s"
 
-#: ayatanawebmail/application.py:1189
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr "from %s"
 
-#: ayatanawebmail/application.py:1202
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr "New mail from %s"
 
-#: ayatanawebmail/dialog.py:60
-msgid "Web page"
-msgstr "Web page"
-
-#: ayatanawebmail/dialog.py:61
-msgid "Command"
-msgstr "Command"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
+msgstr ""
 
-#: ayatanawebmail/dialog.py:93
+#: /ayatanawebmail/dialog.py:61
 msgid ""
-"Append an additional string - you can use the $MSG_THREAD and $MSG_UID "
-"placeholders."
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
-"Append an additional string - you can use the $MSG_THREAD and $MSG_UID "
-"placeholders."
 
-#: ayatanawebmail/dialog.py:114 ayatanawebmail/dialog.py:128
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr "(None)"
 
-#: ayatanawebmail/dialog.py:156
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr "Ayatana Webmail Preferences"
 
-#: ayatanawebmail/dialog.py:164
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr "Accounts"
 
-#: ayatanawebmail/dialog.py:165
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr "Options"
 
-#: ayatanawebmail/dialog.py:166
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr "Support"
 
-#: ayatanawebmail/dialog.py:167
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr "About"
 
-#: ayatanawebmail/dialog.py:228
-msgid ""
-"Please visit the following link and enable access for less secure apps:"
-msgstr "Please visit the following link and enable access for less secure apps:"
-
-#: ayatanawebmail/dialog.py:230
-msgid "Access blocked by Google"
-msgstr "Access blocked by Google"
-
-#: ayatanawebmail/dialog.py:234
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr "Failed to connect to mail account. The returned error was:"
 
-#: ayatanawebmail/dialog.py:235
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr "Connection failure"
 
-#: ayatanawebmail/dialog.py:254
-msgid "Choose an account"
-msgstr "Choose an account"
-
-#: ayatanawebmail/dialog.py:259
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr "Add"
 
-#: ayatanawebmail/dialog.py:261
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr "Remove"
 
-#: ayatanawebmail/dialog.py:276
-msgid "Server data"
-msgstr "Server data"
+#: /ayatanawebmail/dialog.py:276
+#, fuzzy
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+msgstr ""
+"Append an additional string - you can use the $MSG_THREAD and $MSG_UID "
+"placeholders."
 
-#: ayatanawebmail/dialog.py:278
-msgid "Account data"
-msgstr "Account data"
+#: /ayatanawebmail/dialog.py:278
+#, fuzzy
+msgid "Account:"
+msgstr "Accounts"
 
-#: ayatanawebmail/dialog.py:289
-msgid "Links"
-msgstr "Links"
+#: /ayatanawebmail/dialog.py:280
+#, fuzzy
+msgid "Server:"
+msgstr "Server data"
 
-#: ayatanawebmail/dialog.py:297
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr "Host:"
 
-#: ayatanawebmail/dialog.py:299
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr "Port:"
 
-#: ayatanawebmail/dialog.py:302
-msgid "Login:"
-msgstr "Login:"
+#: /ayatanawebmail/dialog.py:286
+msgid "Username:"
+msgstr ""
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr "Password:"
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr "Folders:"
 
-#: ayatanawebmail/dialog.py:309
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr "Home:"
 
-#: ayatanawebmail/dialog.py:311
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr "Compose:"
 
-#: ayatanawebmail/dialog.py:313
+#: /ayatanawebmail/dialog.py:296
+msgid "Sent:"
+msgstr "Sent:"
+
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr "Inbox:"
 
-#: ayatanawebmail/dialog.py:316
-msgid "Sent:"
-msgstr "Sent:"
+#: /ayatanawebmail/dialog.py:300
+#, fuzzy
+msgid "Message:"
+msgstr "Message actions"
 
-#: ayatanawebmail/dialog.py:354
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr "Mark message as read"
 
-#: ayatanawebmail/dialog.py:355
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr "Open message in browser/Execute command"
 
-#: ayatanawebmail/dialog.py:356
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr "Ask me what to do"
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr "Enable notifications:"
 
-#: ayatanawebmail/dialog.py:368
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr "Play sound when a message is received:"
 
-#: ayatanawebmail/dialog.py:370
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr "Merge messages from the same conversation:"
 
-#: ayatanawebmail/dialog.py:372
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr "Hide count when zero:"
 
-#: ayatanawebmail/dialog.py:374
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr "When a message is activated:"
 
-#: ayatanawebmail/dialog.py:377
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr "Execute this command when a message is received:"
 
-#: ayatanawebmail/dialog.py:384
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr "Custom sound to play:"
 
-#: ayatanawebmail/dialog.py:400
-msgid "Report a bug/Request a feature"
+#: /ayatanawebmail/dialog.py:382
+msgid "Report a bug"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:384
+#, fuzzy
+msgid "Request a feature"
 msgstr "Report a bug/Request a feature"
 
-#: ayatanawebmail/dialog.py:402
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
+#, python-brace-format
+msgid "It's a good idea to add the {labelname} label to your issue."
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:387
 msgid "Ask a question"
 msgstr "Ask a question"
 
-#: ayatanawebmail/dialog.py:404
+#: /ayatanawebmail/dialog.py:390
 msgid "Help translate"
 msgstr "Help translate"
 
-#: ayatanawebmail/dialog.py:406
-msgid "Project page"
-msgstr "Project page"
-
-#: ayatanawebmail/dialog.py:408
+#: /ayatanawebmail/dialog.py:392
 msgid "Source code"
 msgstr "Source code"
 
-#: ayatanawebmail/dialog.py:410
-msgid "Repository"
-msgstr "Repository"
-
-#: ayatanawebmail/dialog.py:412
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr "Home page"
 
-#: ayatanawebmail/dialog.py:426
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr "translator-credits"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
-msgstr "Ayatana Webmail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+#, fuzzy
+msgid "Enable notifications"
+msgstr "Enable notifications:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+#, fuzzy
+msgid "Play sound when new messages arrive."
+msgstr "Play sound when a message is received:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+#, fuzzy
+msgid "Hide message count"
+msgstr "Open message/Run command"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+#, fuzzy
+msgid "Run this command when new messages arrive."
+msgstr "Execute this command when a message is received:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+#, fuzzy
+msgid "Custom sound"
+msgstr "Custom sound to play:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+#, fuzzy
+msgid "Play a custom sound when new messages arrive."
+msgstr "Play sound when a message is received:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+#, fuzzy
+msgid "Merge messages"
+msgstr "Mark message as read"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+#, fuzzy
+msgid "Merge messages belonging to the same conversation."
+msgstr "Merge messages from the same conversation:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+#, fuzzy
+msgid "Message action"
+msgstr "Message actions"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+#, fuzzy
+msgid "Action to perform when a message is activated."
+msgstr "When a message is activated:"
+
+#, python-brace-format
+#~ msgid "You can run \"{command}\" to delete all your login settings."
+#~ msgstr "You can run \"{command}\" to delete all your login settings."
+
+#~ msgid "Web page"
+#~ msgstr "Web page"
+
+#~ msgid "Command"
+#~ msgstr "Command"
+
+#~ msgid ""
+#~ "Please visit the following link and enable access for less secure apps:"
+#~ msgstr ""
+#~ "Please visit the following link and enable access for less secure apps:"
+
+#~ msgid "Access blocked by Google"
+#~ msgstr "Access blocked by Google"
+
+#~ msgid "Choose an account"
+#~ msgstr "Choose an account"
+
+#~ msgid "Account data"
+#~ msgstr "Account data"
+
+#~ msgid "Links"
+#~ msgstr "Links"
+
+#~ msgid "Login:"
+#~ msgstr "Login:"
+
+#~ msgid "Project page"
+#~ msgstr "Project page"
+
+#~ msgid "Repository"
+#~ msgstr "Repository"
+
+#~ msgid "Ayatana Webmail"
+#~ msgstr "Ayatana Webmail"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:39
-msgid "Webmail notifications and actions for any desktop"
-msgstr "Webmail notifications and actions for any desktop"
+#~ msgid "Webmail notifications and actions for any desktop"
+#~ msgstr "Webmail notifications and actions for any desktop"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:74
-msgid "Mark all as read"
-msgstr "Mark all as read"
+#~ msgid "Mark all as read"
+#~ msgstr "Mark all as read"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:112
-msgid "Compose Mail"
-msgstr "Compose Mail"
+#~ msgid "Compose Mail"
+#~ msgstr "Compose Mail"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:152
-msgid "Sent"
-msgstr "Sent"
+#~ msgid "Sent"
+#~ msgstr "Sent"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:228
-msgid "Inbox"
-msgstr "Inbox"
+#~ msgid "Inbox"
+#~ msgstr "Inbox"
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
-msgstr "Ayatana Webmail (service)"
+#~ msgid "Ayatana Webmail (service)"
+#~ msgstr "Ayatana Webmail (service)"
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:38
-msgid "Display notifications about new mail"
-msgstr "Display notifications about new mail"
+#~ msgid "Display notifications about new mail"
+#~ msgstr "Display notifications about new mail"
diff --git a/po/en_CA.po b/po/en_CA.po
index 05d97c4..365eeb2 100644
--- a/po/en_CA.po
+++ b/po/en_CA.po
@@ -6,13 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/"
-"issues\n"
-"POT-Creation-Date: 2020-04-03 12:21+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: 2020-12-31 03:29+0000\n"
 "Last-Translator: J. Lavoie <j.lavoie@net-c.ca>\n"
-"Language-Team: English (Canada) <https://hosted.weblate.org/projects/"
-"ayatana-indicators/ayatana-webmail/en_CA/>\n"
+"Language-Team: English (Canada) <https://hosted.weblate.org/projects/ayatana-"
+"indicators/ayatana-webmail/en_CA/>\n"
 "Language: en_CA\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,312 +20,359 @@ msgstr ""
 "X-Generator: Weblate 4.4.1-dev\n"
 "X-Launchpad-Export-Date: 2020-04-04 05:58+0000\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr ""
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr ""
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr ""
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:205
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr ""
 
-#: ayatanawebmail/application.py:212
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr "Clear"
 
-#: ayatanawebmail/application.py:219
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr "Settings"
 
-#: ayatanawebmail/application.py:980
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr "No subject"
 
-#: ayatanawebmail/application.py:1132
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr ""
 
-#: ayatanawebmail/application.py:1133
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
 msgid ""
 "Unable to connect to account \"{accountName}\", the application will now "
 "exit."
 msgstr ""
 
-#: ayatanawebmail/application.py:1133
-#, python-brace-format
-msgid "You can run \"{command}\" to delete all your login settings."
-msgstr ""
-
-#: ayatanawebmail/application.py:1158
-#, python-format
-msgid "You have %d unread mail"
-msgid_plural "You have %d unread mails"
+#: /ayatanawebmail/application.py:1131
+#, fuzzy, python-format
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
 msgstr[0] "You have %d unread mail"
 msgstr[1] "You have %d unread mails"
 
-#: ayatanawebmail/application.py:1185
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr ""
 
-#: ayatanawebmail/application.py:1187
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1189
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1202
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr "New mail from %s"
 
-#: ayatanawebmail/dialog.py:60
-msgid "Web page"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:61
-msgid "Command"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:93
+#: /ayatanawebmail/dialog.py:61
 msgid ""
-"Append an additional string - you can use the $MSG_THREAD and $MSG_UID "
-"placeholders."
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:114 ayatanawebmail/dialog.py:128
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:156
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr "Ayatana Webmail Preferences"
 
-#: ayatanawebmail/dialog.py:164
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr "Accounts"
 
-#: ayatanawebmail/dialog.py:165
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr "Options"
 
-#: ayatanawebmail/dialog.py:166
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:167
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:228
-msgid ""
-"Please visit the following link and enable access for less secure apps:"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:230
-msgid "Access blocked by Google"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:234
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:235
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:254
-msgid "Choose an account"
-msgstr "Choose an account"
-
-#: ayatanawebmail/dialog.py:259
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr "Add"
 
-#: ayatanawebmail/dialog.py:261
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr "Remove"
 
-#: ayatanawebmail/dialog.py:276
-msgid "Server data"
-msgstr "Server data"
+#: /ayatanawebmail/dialog.py:276
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+msgstr ""
 
-#: ayatanawebmail/dialog.py:278
-msgid "Account data"
-msgstr "Account data"
+#: /ayatanawebmail/dialog.py:278
+#, fuzzy
+msgid "Account:"
+msgstr "Accounts"
 
-#: ayatanawebmail/dialog.py:289
-msgid "Links"
-msgstr ""
+#: /ayatanawebmail/dialog.py:280
+#, fuzzy
+msgid "Server:"
+msgstr "Server data"
 
-#: ayatanawebmail/dialog.py:297
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr "Host:"
 
-#: ayatanawebmail/dialog.py:299
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr "Port:"
 
-#: ayatanawebmail/dialog.py:302
-msgid "Login:"
-msgstr "Login:"
+#: /ayatanawebmail/dialog.py:286
+msgid "Username:"
+msgstr ""
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr "Password:"
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:309
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr "Home:"
 
-#: ayatanawebmail/dialog.py:311
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr "Compose:"
 
-#: ayatanawebmail/dialog.py:313
+#: /ayatanawebmail/dialog.py:296
+msgid "Sent:"
+msgstr "Sent:"
+
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr "Inbox:"
 
-#: ayatanawebmail/dialog.py:316
-msgid "Sent:"
-msgstr "Sent:"
+#: /ayatanawebmail/dialog.py:300
+msgid "Message:"
+msgstr ""
 
-#: ayatanawebmail/dialog.py:354
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:355
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:356
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr "Enable notifications:"
 
-#: ayatanawebmail/dialog.py:368
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:370
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:372
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:374
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:377
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:384
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:400
-msgid "Report a bug/Request a feature"
+#: /ayatanawebmail/dialog.py:382
+msgid "Report a bug"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:402
-msgid "Ask a question"
+#: /ayatanawebmail/dialog.py:384
+msgid "Request a feature"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:404
-msgid "Help translate"
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
+#, python-brace-format
+msgid "It's a good idea to add the {labelname} label to your issue."
 msgstr ""
 
-#: ayatanawebmail/dialog.py:406
-msgid "Project page"
+#: /ayatanawebmail/dialog.py:387
+msgid "Ask a question"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:408
-msgid "Source code"
+#: /ayatanawebmail/dialog.py:390
+msgid "Help translate"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:410
-msgid "Repository"
+#: /ayatanawebmail/dialog.py:392
+msgid "Source code"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:412
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:426
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
-msgstr "Ayatana Webmail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+#, fuzzy
+msgid "Enable notifications"
+msgstr "Enable notifications:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+msgid "Play sound when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+msgid "Hide message count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:39
-msgid "Webmail notifications and actions for any desktop"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:74
-msgid "Mark all as read"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+msgid "Run this command when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:112
-msgid "Compose Mail"
-msgstr "Compose Mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+msgid "Custom sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+msgid "Play a custom sound when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+msgid "Merge messages"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+msgid "Merge messages belonging to the same conversation."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+msgid "Message action"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+msgid "Action to perform when a message is activated."
+msgstr ""
+
+#~ msgid "Choose an account"
+#~ msgstr "Choose an account"
+
+#~ msgid "Account data"
+#~ msgstr "Account data"
+
+#~ msgid "Login:"
+#~ msgstr "Login:"
+
+#~ msgid "Ayatana Webmail"
+#~ msgstr "Ayatana Webmail"
+
+#~ msgid "Compose Mail"
+#~ msgstr "Compose Mail"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:152
-msgid "Sent"
-msgstr "Sent"
+#~ msgid "Sent"
+#~ msgstr "Sent"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:228
-msgid "Inbox"
-msgstr "Inbox"
+#~ msgid "Inbox"
+#~ msgstr "Inbox"
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
-msgstr "Ayatana Webmail (service)"
+#~ msgid "Ayatana Webmail (service)"
+#~ msgstr "Ayatana Webmail (service)"
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:38
-msgid "Display notifications about new mail"
-msgstr "Display notifications about new mail"
+#~ msgid "Display notifications about new mail"
+#~ msgstr "Display notifications about new mail"
diff --git a/po/en_GB.po b/po/en_GB.po
index 9b7026c..74288c6 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -6,9 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/"
-"issues\n"
-"POT-Creation-Date: 2020-04-03 12:21+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: 2020-10-11 16:26+0000\n"
 "Last-Translator: Rob Pearson <rob.dunedin@gmail.com>\n"
 "Language-Team: English (United Kingdom) <https://hosted.weblate.org/projects/"
@@ -21,59 +20,59 @@ msgstr ""
 "X-Generator: Weblate 4.3-dev\n"
 "X-Launchpad-Export-Date: 2020-04-04 05:58+0000\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr "Select account"
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr "Which account's command/web page would you like to open?"
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr "Message actions"
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr "Delete"
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr "Mark as read"
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr "Open message/Run command"
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr "Sender"
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr "Subject"
 
-#: ayatanawebmail/application.py:205
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr "Open webmail home page"
 
-#: ayatanawebmail/application.py:212
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr "Clear"
 
-#: ayatanawebmail/application.py:219
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr "Settings"
 
-#: ayatanawebmail/application.py:980
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr "No subject"
 
-#: ayatanawebmail/application.py:1132
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr "Connection error"
 
-#: ayatanawebmail/application.py:1133
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
 msgid ""
 "Unable to connect to account \"{accountName}\", the application will now "
@@ -82,256 +81,347 @@ msgstr ""
 "Unable to connect to account \"{accountName}\", the application will now "
 "exit."
 
-#: ayatanawebmail/application.py:1133
-#, python-brace-format
-msgid "You can run \"{command}\" to delete all your login settings."
-msgstr "You can run \"{command}\" to delete all your login settings."
-
-#: ayatanawebmail/application.py:1158
-#, python-format
-msgid "You have %d unread mail"
-msgid_plural "You have %d unread mails"
+#: /ayatanawebmail/application.py:1131
+#, fuzzy, python-format
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
 msgstr[0] "You have %d unread message"
 msgstr[1] "You have %d unread messages"
 
-#: ayatanawebmail/application.py:1185
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr "from %(t0)s, %(t1)s and others"
 
-#: ayatanawebmail/application.py:1187
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr "from %(t0)s and %(t1)s"
 
-#: ayatanawebmail/application.py:1189
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr "from %s"
 
-#: ayatanawebmail/application.py:1202
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr "New message from %s"
 
-#: ayatanawebmail/dialog.py:60
-msgid "Web page"
-msgstr "Web page"
-
-#: ayatanawebmail/dialog.py:61
-msgid "Command"
-msgstr "Command"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
+msgstr ""
 
-#: ayatanawebmail/dialog.py:93
+#: /ayatanawebmail/dialog.py:61
 msgid ""
-"Append an additional string - you can use the $MSG_THREAD and $MSG_UID "
-"placeholders."
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
-"Append an additional string - you can use the $MSG_THREAD and $MSG_UID "
-"placeholders."
 
-#: ayatanawebmail/dialog.py:114 ayatanawebmail/dialog.py:128
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr "(None)"
 
-#: ayatanawebmail/dialog.py:156
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr "Ayatana Webmail Preferences"
 
-#: ayatanawebmail/dialog.py:164
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr "Accounts"
 
-#: ayatanawebmail/dialog.py:165
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr "Options"
 
-#: ayatanawebmail/dialog.py:166
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr "Support"
 
-#: ayatanawebmail/dialog.py:167
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr "About"
 
-#: ayatanawebmail/dialog.py:228
-msgid ""
-"Please visit the following link and enable access for less secure apps:"
-msgstr ""
-"Please visit the following link and enable access for less secure apps:"
-
-#: ayatanawebmail/dialog.py:230
-msgid "Access blocked by Google"
-msgstr "Access blocked by Google"
-
-#: ayatanawebmail/dialog.py:234
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr "Failed to connect to mail account. The returned error was:"
 
-#: ayatanawebmail/dialog.py:235
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr "Connection failure"
 
-#: ayatanawebmail/dialog.py:254
-msgid "Choose an account"
-msgstr "Choose an account"
-
-#: ayatanawebmail/dialog.py:259
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr "Add"
 
-#: ayatanawebmail/dialog.py:261
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr "Remove"
 
-#: ayatanawebmail/dialog.py:276
-msgid "Server data"
-msgstr "Server data"
+#: /ayatanawebmail/dialog.py:276
+#, fuzzy
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+msgstr ""
+"Append an additional string - you can use the $MSG_THREAD and $MSG_UID "
+"placeholders."
 
-#: ayatanawebmail/dialog.py:278
-msgid "Account data"
-msgstr "Account data"
+#: /ayatanawebmail/dialog.py:278
+#, fuzzy
+msgid "Account:"
+msgstr "Accounts"
 
-#: ayatanawebmail/dialog.py:289
-msgid "Links"
-msgstr "Links"
+#: /ayatanawebmail/dialog.py:280
+#, fuzzy
+msgid "Server:"
+msgstr "Server data"
 
-#: ayatanawebmail/dialog.py:297
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr "Host:"
 
-#: ayatanawebmail/dialog.py:299
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr "Port:"
 
-#: ayatanawebmail/dialog.py:302
-msgid "Login:"
-msgstr "Login:"
+#: /ayatanawebmail/dialog.py:286
+msgid "Username:"
+msgstr ""
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr "Password:"
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr "Folders:"
 
-#: ayatanawebmail/dialog.py:309
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr "Home:"
 
-#: ayatanawebmail/dialog.py:311
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr "Compose:"
 
-#: ayatanawebmail/dialog.py:313
+#: /ayatanawebmail/dialog.py:296
+msgid "Sent:"
+msgstr "Sent:"
+
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr "Inbox:"
 
-#: ayatanawebmail/dialog.py:316
-msgid "Sent:"
-msgstr "Sent:"
+#: /ayatanawebmail/dialog.py:300
+#, fuzzy
+msgid "Message:"
+msgstr "Message actions"
 
-#: ayatanawebmail/dialog.py:354
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr "Mark message as read"
 
-#: ayatanawebmail/dialog.py:355
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr "Open message in browser/Execute command"
 
-#: ayatanawebmail/dialog.py:356
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr "Ask me what to do"
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr "Enable notifications:"
 
-#: ayatanawebmail/dialog.py:368
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr "Play sound when a message is received:"
 
-#: ayatanawebmail/dialog.py:370
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr "Merge messages from the same conversation:"
 
-#: ayatanawebmail/dialog.py:372
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr "Hide count when zero:"
 
-#: ayatanawebmail/dialog.py:374
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr "When a message is activated:"
 
-#: ayatanawebmail/dialog.py:377
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr "Execute this command when a message is received:"
 
-#: ayatanawebmail/dialog.py:384
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr "Custom sound to play:"
 
-#: ayatanawebmail/dialog.py:400
-msgid "Report a bug/Request a feature"
+#: /ayatanawebmail/dialog.py:382
+msgid "Report a bug"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:384
+#, fuzzy
+msgid "Request a feature"
 msgstr "Report a bug/Request a feature"
 
-#: ayatanawebmail/dialog.py:402
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
+#, python-brace-format
+msgid "It's a good idea to add the {labelname} label to your issue."
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:387
 msgid "Ask a question"
 msgstr "Ask a question"
 
-#: ayatanawebmail/dialog.py:404
+#: /ayatanawebmail/dialog.py:390
 msgid "Help translate"
 msgstr "Help translate"
 
-#: ayatanawebmail/dialog.py:406
-msgid "Project page"
-msgstr "Project page"
-
-#: ayatanawebmail/dialog.py:408
+#: /ayatanawebmail/dialog.py:392
 msgid "Source code"
 msgstr "Source code"
 
-#: ayatanawebmail/dialog.py:410
-msgid "Repository"
-msgstr "Repository"
-
-#: ayatanawebmail/dialog.py:412
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr "Home page"
 
-#: ayatanawebmail/dialog.py:426
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr "translator-credits"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
-msgstr "Ayatana Webmail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+#, fuzzy
+msgid "Enable notifications"
+msgstr "Enable notifications:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+#, fuzzy
+msgid "Play sound when new messages arrive."
+msgstr "Play sound when a message is received:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+#, fuzzy
+msgid "Hide message count"
+msgstr "Open message/Run command"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+#, fuzzy
+msgid "Run this command when new messages arrive."
+msgstr "Execute this command when a message is received:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+#, fuzzy
+msgid "Custom sound"
+msgstr "Custom sound to play:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+#, fuzzy
+msgid "Play a custom sound when new messages arrive."
+msgstr "Play sound when a message is received:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+#, fuzzy
+msgid "Merge messages"
+msgstr "Mark message as read"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+#, fuzzy
+msgid "Merge messages belonging to the same conversation."
+msgstr "Merge messages from the same conversation:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+#, fuzzy
+msgid "Message action"
+msgstr "Message actions"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+#, fuzzy
+msgid "Action to perform when a message is activated."
+msgstr "When a message is activated:"
+
+#, python-brace-format
+#~ msgid "You can run \"{command}\" to delete all your login settings."
+#~ msgstr "You can run \"{command}\" to delete all your login settings."
+
+#~ msgid "Web page"
+#~ msgstr "Web page"
+
+#~ msgid "Command"
+#~ msgstr "Command"
+
+#~ msgid ""
+#~ "Please visit the following link and enable access for less secure apps:"
+#~ msgstr ""
+#~ "Please visit the following link and enable access for less secure apps:"
+
+#~ msgid "Access blocked by Google"
+#~ msgstr "Access blocked by Google"
+
+#~ msgid "Choose an account"
+#~ msgstr "Choose an account"
+
+#~ msgid "Account data"
+#~ msgstr "Account data"
+
+#~ msgid "Links"
+#~ msgstr "Links"
+
+#~ msgid "Login:"
+#~ msgstr "Login:"
+
+#~ msgid "Project page"
+#~ msgstr "Project page"
+
+#~ msgid "Repository"
+#~ msgstr "Repository"
+
+#~ msgid "Ayatana Webmail"
+#~ msgstr "Ayatana Webmail"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:39
-msgid "Webmail notifications and actions for any desktop"
-msgstr "Webmail notifications and actions for any desktop"
+#~ msgid "Webmail notifications and actions for any desktop"
+#~ msgstr "Webmail notifications and actions for any desktop"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:74
-msgid "Mark all as read"
-msgstr "Mark all as read"
+#~ msgid "Mark all as read"
+#~ msgstr "Mark all as read"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:112
-msgid "Compose Mail"
-msgstr "Compose Mail"
+#~ msgid "Compose Mail"
+#~ msgstr "Compose Mail"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:152
-msgid "Sent"
-msgstr "Sent"
+#~ msgid "Sent"
+#~ msgstr "Sent"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:228
-msgid "Inbox"
-msgstr "Inbox"
+#~ msgid "Inbox"
+#~ msgstr "Inbox"
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
-msgstr "Ayatana Webmail (service)"
+#~ msgid "Ayatana Webmail (service)"
+#~ msgstr "Ayatana Webmail (service)"
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:38
-msgid "Display notifications about new mail"
-msgstr "Display notifications about new mail"
+#~ msgid "Display notifications about new mail"
+#~ msgstr "Display notifications about new mail"
diff --git a/po/eo.po b/po/eo.po
index 0d28afd..968a266 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -6,13 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail 22.6.28\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/"
-"issues\n"
-"POT-Creation-Date: 2020-08-22 20:15+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: 2021-11-24 14:52+0000\n"
 "Last-Translator: phlostically <phlostically@mailinator.com>\n"
-"Language-Team: Esperanto <https://hosted.weblate.org/projects/"
-"ayatana-indicators/ayatana-webmail/eo/>\n"
+"Language-Team: Esperanto <https://hosted.weblate.org/projects/ayatana-"
+"indicators/ayatana-webmail/eo/>\n"
 "Language: eo\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,301 +19,363 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 4.10-dev\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr "Elektu konton"
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr "Agoj pri mesaĝo"
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr "Forviŝi"
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr "Marki kiel legitan"
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr "Malfermi mesaĝon/ruli komandon"
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr "Sendinto"
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr "Titolo"
 
-#: ayatanawebmail/application.py:204
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr ""
 
-#: ayatanawebmail/application.py:211
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr "Forviŝi"
 
-#: ayatanawebmail/application.py:218
-#: data/usr/share/applications/ayatana-webmail.desktop:35
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr "Agordoj"
 
-#: ayatanawebmail/application.py:957
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr "Sen titolo"
 
-#: ayatanawebmail/application.py:1110
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr "Eraro pri konekto"
 
-#: ayatanawebmail/application.py:1111
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
-msgid "Unable to connect to account \"{accountName}\", the application will now exit."
+msgid ""
+"Unable to connect to account \"{accountName}\", the application will now "
+"exit."
 msgstr ""
 "Ne eblas konekti al la konto «{accountName}»; pro tio, la programo nun ĉesos."
 
-#: ayatanawebmail/application.py:1136
-#, python-format
-msgid "You have %d unread mail"
-msgid_plural "You have %d unread mails"
+#: /ayatanawebmail/application.py:1131
+#, fuzzy, python-format
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
 msgstr[0] "Ekzistas %d nelegita mesaĝo"
 msgstr[1] "Ekzistas %d nelegitaj mesaĝoj"
 
-#: ayatanawebmail/application.py:1163
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr "de %(t0)s, %(t1)s kaj aliuloj"
 
-#: ayatanawebmail/application.py:1165
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr "de %(t0)s kaj %(t1)s"
 
-#: ayatanawebmail/application.py:1167
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr "de %s"
 
-#: ayatanawebmail/application.py:1180
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr "Nova retmesaĝo de %s"
 
-#: ayatanawebmail/dialog.py:60
-msgid "If this string starts with http:// or https://, the application will open it in your browser - otherwise, it will be run as a command"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
+msgstr "Propra"
+
+#: /ayatanawebmail/dialog.py:61
+msgid ""
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:90 ayatanawebmail/dialog.py:104
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr "(Nenio)"
 
-#: ayatanawebmail/dialog.py:132
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr "Agordoj pri Ayatana Webmail"
 
-#: ayatanawebmail/dialog.py:140
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr "Kontoj"
 
-#: ayatanawebmail/dialog.py:141
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr "Opcioj"
 
-#: ayatanawebmail/dialog.py:142
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr "Subteno"
 
-#: ayatanawebmail/dialog.py:143
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr "Pri"
 
-#: ayatanawebmail/dialog.py:204
-msgid "Please visit the following link and enable access for less secure apps:"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:206
-msgid "Access blocked by Google"
-msgstr "Google malpermesas la atingon"
-
-#: ayatanawebmail/dialog.py:210
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr "Malsukcesis konekti al retpoŝta konto. Jen la eraro:"
 
-#: ayatanawebmail/dialog.py:211
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr "Eraro pri konekto"
 
-#: ayatanawebmail/dialog.py:234
-msgid "Custom"
-msgstr "Propra"
-
-#: ayatanawebmail/dialog.py:242
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr "Enmeti"
 
-#: ayatanawebmail/dialog.py:244
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr "Forigi"
 
-#: ayatanawebmail/dialog.py:286
-msgid "The application will append this string to \"Inbox\" to access a specific message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+#: /ayatanawebmail/dialog.py:276
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:288
+#: /ayatanawebmail/dialog.py:278
 msgid "Account:"
 msgstr "Konto:"
 
-#: ayatanawebmail/dialog.py:290
+#: /ayatanawebmail/dialog.py:280
 msgid "Server:"
 msgstr "Servilo:"
 
-#: ayatanawebmail/dialog.py:292
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr "Gastiganto:"
 
-#: ayatanawebmail/dialog.py:294
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr "Pordo:"
 
-#: ayatanawebmail/dialog.py:296
+#: /ayatanawebmail/dialog.py:286
 msgid "Username:"
 msgstr "Salutnomo:"
 
-#: ayatanawebmail/dialog.py:298
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr "Pasvorto:"
 
-#: ayatanawebmail/dialog.py:300
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr "Dosierujoj:"
 
-#: ayatanawebmail/dialog.py:302
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr "Hejmo:"
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr "Verki:"
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:296
 msgid "Sent:"
 msgstr "Senditaj:"
 
-#: ayatanawebmail/dialog.py:308
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr "Leterkesto:"
 
-#: ayatanawebmail/dialog.py:310
+#: /ayatanawebmail/dialog.py:300
 msgid "Message:"
 msgstr "Mesaĝo:"
 
-#: ayatanawebmail/dialog.py:346
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr "Marki mesaĝon kiel legitan"
 
-#: ayatanawebmail/dialog.py:347
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr "Malfermi mesaĝon en TTT-legilo/Ruli komandon"
 
-#: ayatanawebmail/dialog.py:348
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr "Demandi min, kion fari"
 
-#: ayatanawebmail/dialog.py:358
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr "Montri sciigojn:"
 
-#: ayatanawebmail/dialog.py:360
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr "Ludi sonon post ricevo de mesaĝo:"
 
-#: ayatanawebmail/dialog.py:362
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:364
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr "Kaŝi la kalkulon, se ĝi estas nul:"
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr "Kiam mesaĝo estas aktivigita:"
 
-#: ayatanawebmail/dialog.py:369
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:376
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr "Propra ludota sono:"
 
-#: ayatanawebmail/dialog.py:392
+#: /ayatanawebmail/dialog.py:382
 msgid "Report a bug"
 msgstr "Raporti cimon"
 
-#: ayatanawebmail/dialog.py:394
+#: /ayatanawebmail/dialog.py:384
 msgid "Request a feature"
 msgstr "Peti funkcion"
 
-#: ayatanawebmail/dialog.py:396 ayatanawebmail/dialog.py:399
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
 #, python-brace-format
 msgid "It's a good idea to add the {labelname} label to your issue."
 msgstr ""
 
-#: ayatanawebmail/dialog.py:397
+#: /ayatanawebmail/dialog.py:387
 msgid "Ask a question"
 msgstr "Demandi"
 
-#: ayatanawebmail/dialog.py:400
+#: /ayatanawebmail/dialog.py:390
 msgid "Help translate"
 msgstr "Helpi tradukadon"
 
-#: ayatanawebmail/dialog.py:402
+#: /ayatanawebmail/dialog.py:392
 msgid "Source code"
 msgstr "Fontkodo"
 
-#: ayatanawebmail/dialog.py:404
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:424
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr "phlostically"
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
-msgstr "Ayatana Webmail (servo)"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+#, fuzzy
+msgid "Enable notifications"
+msgstr "Montri sciigojn:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+#, fuzzy
+msgid "Play sound when new messages arrive."
+msgstr "Ludi sonon post ricevo de mesaĝo:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+#, fuzzy
+msgid "Hide message count"
+msgstr "Malfermi mesaĝon/ruli komandon"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+#, fuzzy
+msgid "Run this command when new messages arrive."
+msgstr "Ludi sonon post ricevo de mesaĝo:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+#, fuzzy
+msgid "Custom sound"
+msgstr "Propra ludota sono:"
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:5
-msgid "Display notifications about new mail"
-msgstr "Sciigi pri novaj mesaĝoj"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+#, fuzzy
+msgid "Play a custom sound when new messages arrive."
+msgstr "Ludi sonon post ricevo de mesaĝo:"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
-msgstr "Ayatana Webmail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+#, fuzzy
+msgid "Merge messages"
+msgstr "Marki mesaĝon kiel legitan"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:5
-msgid "Webmail notifications and actions for any desktop"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+msgid "Merge messages belonging to the same conversation."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:15
-msgid "Mark all as read"
-msgstr "Marki ĉiujn kiel legitajn"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+#, fuzzy
+msgid "Message action"
+msgstr "Agoj pri mesaĝo"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+#, fuzzy
+msgid "Action to perform when a message is activated."
+msgstr "Kiam mesaĝo estas aktivigita:"
+
+#~ msgid "Access blocked by Google"
+#~ msgstr "Google malpermesas la atingon"
+
+#~ msgid "Ayatana Webmail (service)"
+#~ msgstr "Ayatana Webmail (servo)"
+
+#~ msgid "Display notifications about new mail"
+#~ msgstr "Sciigi pri novaj mesaĝoj"
+
+#~ msgid "Ayatana Webmail"
+#~ msgstr "Ayatana Webmail"
+
+#~ msgid "Mark all as read"
+#~ msgstr "Marki ĉiujn kiel legitajn"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:20
-msgid "Compose Mail"
-msgstr "Verki mesaĝon"
+#~ msgid "Compose Mail"
+#~ msgstr "Verki mesaĝon"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:25
-msgid "Sent"
-msgstr "Senditaj"
+#~ msgid "Sent"
+#~ msgstr "Senditaj"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:30
-msgid "Inbox"
-msgstr "Leterkesto"
+#~ msgid "Inbox"
+#~ msgstr "Leterkesto"
diff --git a/po/es.po b/po/es.po
index 85fed10..21239dd 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,13 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/"
-"issues\n"
-"POT-Creation-Date: 2020-04-03 12:21+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: 2020-09-29 05:40+0000\n"
 "Last-Translator: Adolfo Jayme Barrientos <fitojb@ubuntu.com>\n"
-"Language-Team: Spanish <https://hosted.weblate.org/projects/"
-"ayatana-indicators/ayatana-webmail/es/>\n"
+"Language-Team: Spanish <https://hosted.weblate.org/projects/ayatana-"
+"indicators/ayatana-webmail/es/>\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,59 +20,59 @@ msgstr ""
 "X-Generator: Weblate 4.3-dev\n"
 "X-Launchpad-Export-Date: 2020-04-04 05:58+0000\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr "Seleccionar cuenta"
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr "¿Qué orden de cuenta o página web quiere abrir?"
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr "Acciones del mensaje"
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr "Eliminar"
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr "Marcar como leído"
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr "Abrir mensaje/ejecutar orden"
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr "Remitente"
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr "Asunto"
 
-#: ayatanawebmail/application.py:205
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr "Abrir sitio web del correo web"
 
-#: ayatanawebmail/application.py:212
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr "Vaciar"
 
-#: ayatanawebmail/application.py:219
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr "Configuración"
 
-#: ayatanawebmail/application.py:980
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr "Sin asunto"
 
-#: ayatanawebmail/application.py:1132
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr "Error de conexión"
 
-#: ayatanawebmail/application.py:1133
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
 msgid ""
 "Unable to connect to account \"{accountName}\", the application will now "
@@ -82,258 +81,350 @@ msgstr ""
 "No se pudo conectar con la cuenta «{accountName}»; la aplicación se cerrará "
 "ahora."
 
-#: ayatanawebmail/application.py:1133
-#, python-brace-format
-msgid "You can run \"{command}\" to delete all your login settings."
-msgstr ""
-"Puede ejecutar «{command}» para eliminar todas sus configuraciones de acceso."
-
-#: ayatanawebmail/application.py:1158
-#, python-format
-msgid "You have %d unread mail"
-msgid_plural "You have %d unread mails"
+#: /ayatanawebmail/application.py:1131
+#, fuzzy, python-format
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
 msgstr[0] "Tiene %d mensaje sin leer"
 msgstr[1] "Tiene %d mensajes sin leer"
 
-#: ayatanawebmail/application.py:1185
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr "de %(t0)s, %(t1)s y otros"
 
-#: ayatanawebmail/application.py:1187
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr "de %(t0)s y %(t1)s"
 
-#: ayatanawebmail/application.py:1189
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr "de %s"
 
-#: ayatanawebmail/application.py:1202
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr "Mensaje nuevo de %s"
 
-#: ayatanawebmail/dialog.py:60
-msgid "Web page"
-msgstr "Página web"
-
-#: ayatanawebmail/dialog.py:61
-msgid "Command"
-msgstr "Orden"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
+msgstr ""
 
-#: ayatanawebmail/dialog.py:93
+#: /ayatanawebmail/dialog.py:61
 msgid ""
-"Append an additional string - you can use the $MSG_THREAD and $MSG_UID "
-"placeholders."
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
-"Añada una cadena adicional; puede utilizar los sustitutorios $MSG_THREAD y "
-"$MSG_UID."
 
-#: ayatanawebmail/dialog.py:114 ayatanawebmail/dialog.py:128
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr "(Ninguno)"
 
-#: ayatanawebmail/dialog.py:156
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr "Preferencias de Ayatana Webmail"
 
-#: ayatanawebmail/dialog.py:164
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr "Cuentas"
 
-#: ayatanawebmail/dialog.py:165
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr "Opciones"
 
-#: ayatanawebmail/dialog.py:166
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr "Asistencia"
 
-#: ayatanawebmail/dialog.py:167
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr "Acerca de"
 
-#: ayatanawebmail/dialog.py:228
-msgid ""
-"Please visit the following link and enable access for less secure apps:"
-msgstr ""
-"Visite el enlace siguiente y permita el acceso a las aplicaciones menos "
-"seguras:"
-
-#: ayatanawebmail/dialog.py:230
-msgid "Access blocked by Google"
-msgstr "Google bloqueó el acceso"
-
-#: ayatanawebmail/dialog.py:234
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr "No se pudo conectar con la cuenta de correo. El error devuelto es:"
 
-#: ayatanawebmail/dialog.py:235
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr "Fallo en la conexión"
 
-#: ayatanawebmail/dialog.py:254
-msgid "Choose an account"
-msgstr "Elija una cuenta"
-
-#: ayatanawebmail/dialog.py:259
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr "Añadir"
 
-#: ayatanawebmail/dialog.py:261
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr "Quitar"
 
-#: ayatanawebmail/dialog.py:276
-msgid "Server data"
-msgstr "Datos del servidor"
+#: /ayatanawebmail/dialog.py:276
+#, fuzzy
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+msgstr ""
+"Añada una cadena adicional; puede utilizar los sustitutorios $MSG_THREAD y "
+"$MSG_UID."
 
-#: ayatanawebmail/dialog.py:278
-msgid "Account data"
-msgstr "Datos de la cuenta"
+#: /ayatanawebmail/dialog.py:278
+#, fuzzy
+msgid "Account:"
+msgstr "Cuentas"
 
-#: ayatanawebmail/dialog.py:289
-msgid "Links"
-msgstr "Enlaces"
+#: /ayatanawebmail/dialog.py:280
+#, fuzzy
+msgid "Server:"
+msgstr "Datos del servidor"
 
-#: ayatanawebmail/dialog.py:297
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr "Servidor:"
 
-#: ayatanawebmail/dialog.py:299
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr "Puerto:"
 
-#: ayatanawebmail/dialog.py:302
-msgid "Login:"
-msgstr "Usuario:"
+#: /ayatanawebmail/dialog.py:286
+msgid "Username:"
+msgstr ""
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr "Contraseña:"
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr "Carpetas:"
 
-#: ayatanawebmail/dialog.py:309
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr "Domicilio:"
 
-#: ayatanawebmail/dialog.py:311
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr "Redactar:"
 
-#: ayatanawebmail/dialog.py:313
+#: /ayatanawebmail/dialog.py:296
+msgid "Sent:"
+msgstr "Enviados:"
+
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr "Bandeja de entrada:"
 
-#: ayatanawebmail/dialog.py:316
-msgid "Sent:"
-msgstr "Enviados:"
+#: /ayatanawebmail/dialog.py:300
+#, fuzzy
+msgid "Message:"
+msgstr "Acciones del mensaje"
 
-#: ayatanawebmail/dialog.py:354
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr "Marcar mensajes como leídos"
 
-#: ayatanawebmail/dialog.py:355
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr "Abrir mensaje en navegador/ejecutar orden"
 
-#: ayatanawebmail/dialog.py:356
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr "Preguntarme qué hacer"
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr "Activar notificaciones:"
 
-#: ayatanawebmail/dialog.py:368
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr "Reproducir sonido al recibir un mensaje:"
 
-#: ayatanawebmail/dialog.py:370
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr "Combinar mensajes de la misma conversación:"
 
-#: ayatanawebmail/dialog.py:372
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr "Ocultar recuento cuando esté en cero:"
 
-#: ayatanawebmail/dialog.py:374
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr "Cuando se active un mensaje:"
 
-#: ayatanawebmail/dialog.py:377
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr "Ejecutar esta orden al recibir un mensaje:"
 
-#: ayatanawebmail/dialog.py:384
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr "Sonido personalizado:"
 
-#: ayatanawebmail/dialog.py:400
-msgid "Report a bug/Request a feature"
+#: /ayatanawebmail/dialog.py:382
+msgid "Report a bug"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:384
+#, fuzzy
+msgid "Request a feature"
 msgstr "Informar de un defecto/Solicitar función"
 
-#: ayatanawebmail/dialog.py:402
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
+#, python-brace-format
+msgid "It's a good idea to add the {labelname} label to your issue."
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:387
 msgid "Ask a question"
 msgstr "Formular una pregunta"
 
-#: ayatanawebmail/dialog.py:404
+#: /ayatanawebmail/dialog.py:390
 msgid "Help translate"
 msgstr "Ayudar a traducir"
 
-#: ayatanawebmail/dialog.py:406
-msgid "Project page"
-msgstr "Página del proyecto"
-
-#: ayatanawebmail/dialog.py:408
+#: /ayatanawebmail/dialog.py:392
 msgid "Source code"
 msgstr "Código fuente"
 
-#: ayatanawebmail/dialog.py:410
-msgid "Repository"
-msgstr "Repositorio"
-
-#: ayatanawebmail/dialog.py:412
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr "Sitio web"
 
-#: ayatanawebmail/dialog.py:426
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr "Adolfo Jayme Barrientos <fitojb@ubuntu.com>, 2020"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
-msgstr "Correo web de Ayatana"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+#, fuzzy
+msgid "Enable notifications"
+msgstr "Activar notificaciones:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+#, fuzzy
+msgid "Play sound when new messages arrive."
+msgstr "Reproducir sonido al recibir un mensaje:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+#, fuzzy
+msgid "Hide message count"
+msgstr "Abrir mensaje/ejecutar orden"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+#, fuzzy
+msgid "Run this command when new messages arrive."
+msgstr "Ejecutar esta orden al recibir un mensaje:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+#, fuzzy
+msgid "Custom sound"
+msgstr "Sonido personalizado:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+#, fuzzy
+msgid "Play a custom sound when new messages arrive."
+msgstr "Reproducir sonido al recibir un mensaje:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+#, fuzzy
+msgid "Merge messages"
+msgstr "Marcar mensajes como leídos"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+#, fuzzy
+msgid "Merge messages belonging to the same conversation."
+msgstr "Combinar mensajes de la misma conversación:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+#, fuzzy
+msgid "Message action"
+msgstr "Acciones del mensaje"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+#, fuzzy
+msgid "Action to perform when a message is activated."
+msgstr "Cuando se active un mensaje:"
+
+#, python-brace-format
+#~ msgid "You can run \"{command}\" to delete all your login settings."
+#~ msgstr ""
+#~ "Puede ejecutar «{command}» para eliminar todas sus configuraciones de "
+#~ "acceso."
+
+#~ msgid "Web page"
+#~ msgstr "Página web"
+
+#~ msgid "Command"
+#~ msgstr "Orden"
+
+#~ msgid ""
+#~ "Please visit the following link and enable access for less secure apps:"
+#~ msgstr ""
+#~ "Visite el enlace siguiente y permita el acceso a las aplicaciones menos "
+#~ "seguras:"
+
+#~ msgid "Access blocked by Google"
+#~ msgstr "Google bloqueó el acceso"
+
+#~ msgid "Choose an account"
+#~ msgstr "Elija una cuenta"
+
+#~ msgid "Account data"
+#~ msgstr "Datos de la cuenta"
+
+#~ msgid "Links"
+#~ msgstr "Enlaces"
+
+#~ msgid "Login:"
+#~ msgstr "Usuario:"
+
+#~ msgid "Project page"
+#~ msgstr "Página del proyecto"
+
+#~ msgid "Repository"
+#~ msgstr "Repositorio"
+
+#~ msgid "Ayatana Webmail"
+#~ msgstr "Correo web de Ayatana"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:39
-msgid "Webmail notifications and actions for any desktop"
-msgstr "Notificaciones y acciones para correo web en cualquier escritorio"
+#~ msgid "Webmail notifications and actions for any desktop"
+#~ msgstr "Notificaciones y acciones para correo web en cualquier escritorio"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:74
-msgid "Mark all as read"
-msgstr "Marcar todos como leídos"
+#~ msgid "Mark all as read"
+#~ msgstr "Marcar todos como leídos"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:112
-msgid "Compose Mail"
-msgstr "Redactar mensaje"
+#~ msgid "Compose Mail"
+#~ msgstr "Redactar mensaje"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:152
-msgid "Sent"
-msgstr "Enviados"
+#~ msgid "Sent"
+#~ msgstr "Enviados"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:228
-msgid "Inbox"
-msgstr "Buzón de entrada"
+#~ msgid "Inbox"
+#~ msgstr "Buzón de entrada"
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
-msgstr "Correo web de Ayatana (servicio)"
+#~ msgid "Ayatana Webmail (service)"
+#~ msgstr "Correo web de Ayatana (servicio)"
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:38
-msgid "Display notifications about new mail"
-msgstr "Mostrar notificaciones de correo nuevo"
+#~ msgid "Display notifications about new mail"
+#~ msgstr "Mostrar notificaciones de correo nuevo"
diff --git a/po/et.po b/po/et.po
index d893b30..28d35be 100644
--- a/po/et.po
+++ b/po/et.po
@@ -6,13 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/"
-"issues\n"
-"POT-Creation-Date: 2020-04-03 12:21+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: 2021-01-27 03:32+0000\n"
 "Last-Translator: Kristjan Räts <kristjanrats@gmail.com>\n"
-"Language-Team: Estonian <https://hosted.weblate.org/projects/"
-"ayatana-indicators/ayatana-webmail/et/>\n"
+"Language-Team: Estonian <https://hosted.weblate.org/projects/ayatana-"
+"indicators/ayatana-webmail/et/>\n"
 "Language: et\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,305 +20,378 @@ msgstr ""
 "X-Generator: Weblate 4.5-dev\n"
 "X-Launchpad-Export-Date: 2020-04-04 05:58+0000\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr "Konto valik"
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr "Millise konto käsu/veebilehe soovid sa avada?"
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr "Sõnumi tegevused"
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr "Kustuta"
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr "Märgi loetuks"
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr "Ava sõnum/käivita käsk"
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr "Saatja"
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr "Teema"
 
-#: ayatanawebmail/application.py:205
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr "Ava veebimeili koduleht"
 
-#: ayatanawebmail/application.py:212
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr "Puhasta"
 
-#: ayatanawebmail/application.py:219
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr "Seaded"
 
-#: ayatanawebmail/application.py:980
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr "Teema puudub"
 
-#: ayatanawebmail/application.py:1132
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr "Ühenduse viga"
 
-#: ayatanawebmail/application.py:1133
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
 msgid ""
 "Unable to connect to account \"{accountName}\", the application will now "
 "exit."
 msgstr "Kontoga \"{accountName}\" ei saa ühendust; rakendus lõpetab töö."
 
-#: ayatanawebmail/application.py:1133
-#, python-brace-format
-msgid "You can run \"{command}\" to delete all your login settings."
-msgstr ""
-
-#: ayatanawebmail/application.py:1158
+#: /ayatanawebmail/application.py:1131
 #, python-format
-msgid "You have %d unread mail"
-msgid_plural "You have %d unread mails"
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ayatanawebmail/application.py:1185
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr "%(t0)s, %(t1)s ja teistelt"
 
-#: ayatanawebmail/application.py:1187
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr "%(t0)s ja %(t1)s"
 
-#: ayatanawebmail/application.py:1189
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr "%s"
 
-#: ayatanawebmail/application.py:1202
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr "Uus kiri %s-lt"
 
-#: ayatanawebmail/dialog.py:60
-msgid "Web page"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:61
-msgid "Command"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:93
+#: /ayatanawebmail/dialog.py:61
 msgid ""
-"Append an additional string - you can use the $MSG_THREAD and $MSG_UID "
-"placeholders."
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:114 ayatanawebmail/dialog.py:128
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr "(puudub)"
 
-#: ayatanawebmail/dialog.py:156
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr "Ayatana Webmaili Seadistus"
 
-#: ayatanawebmail/dialog.py:164
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr "Kontod"
 
-#: ayatanawebmail/dialog.py:165
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr "Valikud"
 
-#: ayatanawebmail/dialog.py:166
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr "Toeta"
 
-#: ayatanawebmail/dialog.py:167
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr "Rakendusest"
 
-#: ayatanawebmail/dialog.py:228
-msgid ""
-"Please visit the following link and enable access for less secure apps:"
-msgstr ""
-"Palun külasta järgnevat viita ja luba vähem turvaliste rakenduste kasutamine:"
-
-#: ayatanawebmail/dialog.py:230
-msgid "Access blocked by Google"
-msgstr "Google juurdepääsu blokeering"
-
-#: ayatanawebmail/dialog.py:234
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr "Meilikontoga ühendumine nurjus. Saadud viga oli:"
 
-#: ayatanawebmail/dialog.py:235
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr "Ühenduse viga"
 
-#: ayatanawebmail/dialog.py:254
-msgid "Choose an account"
-msgstr "Vali konto"
-
-#: ayatanawebmail/dialog.py:259
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr "Lisa"
 
-#: ayatanawebmail/dialog.py:261
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr "Eemalda"
 
-#: ayatanawebmail/dialog.py:276
-msgid "Server data"
-msgstr "Serveri andmed"
+#: /ayatanawebmail/dialog.py:276
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+msgstr ""
 
-#: ayatanawebmail/dialog.py:278
-msgid "Account data"
-msgstr "Konto andmed"
+#: /ayatanawebmail/dialog.py:278
+#, fuzzy
+msgid "Account:"
+msgstr "Kontod"
 
-#: ayatanawebmail/dialog.py:289
-msgid "Links"
-msgstr ""
+#: /ayatanawebmail/dialog.py:280
+#, fuzzy
+msgid "Server:"
+msgstr "Serveri andmed"
 
-#: ayatanawebmail/dialog.py:297
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr "Server:"
 
-#: ayatanawebmail/dialog.py:299
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr "Port:"
 
-#: ayatanawebmail/dialog.py:302
-msgid "Login:"
-msgstr "Kasutajanimi:"
+#: /ayatanawebmail/dialog.py:286
+msgid "Username:"
+msgstr ""
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr "Parool:"
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr "Kaustad:"
 
-#: ayatanawebmail/dialog.py:309
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr "Kodu:"
 
-#: ayatanawebmail/dialog.py:311
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr "Koosta:"
 
-#: ayatanawebmail/dialog.py:313
+#: /ayatanawebmail/dialog.py:296
+msgid "Sent:"
+msgstr "Saadetud:"
+
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr "Sisenevad:"
 
-#: ayatanawebmail/dialog.py:316
-msgid "Sent:"
-msgstr "Saadetud:"
+#: /ayatanawebmail/dialog.py:300
+#, fuzzy
+msgid "Message:"
+msgstr "Sõnumi tegevused"
 
-#: ayatanawebmail/dialog.py:354
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr "Märgi sõnum loetuks"
 
-#: ayatanawebmail/dialog.py:355
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr "Ava sõnum lehitsejas/käivita käsk"
 
-#: ayatanawebmail/dialog.py:356
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr "Küsi, mida teha"
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr "Luba teavitused:"
 
-#: ayatanawebmail/dialog.py:368
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr "Mängi sõnumi saabumisel heli:"
 
-#: ayatanawebmail/dialog.py:370
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr "Ühenda sama vestluse sõnumid:"
 
-#: ayatanawebmail/dialog.py:372
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr "Peida kogus, kui see on null:"
 
-#: ayatanawebmail/dialog.py:374
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr "Kui sõnum on aktiveeritud:"
 
-#: ayatanawebmail/dialog.py:377
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr "Sõnumi saamisel käivita see käsk:"
 
-#: ayatanawebmail/dialog.py:384
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr "Kohandatud heli, mida mängida:"
 
-#: ayatanawebmail/dialog.py:400
-msgid "Report a bug/Request a feature"
+#: /ayatanawebmail/dialog.py:382
+msgid "Report a bug"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:402
+#: /ayatanawebmail/dialog.py:384
+msgid "Request a feature"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
+#, python-brace-format
+msgid "It's a good idea to add the {labelname} label to your issue."
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:387
 msgid "Ask a question"
 msgstr "Küsi küsimus"
 
-#: ayatanawebmail/dialog.py:404
+#: /ayatanawebmail/dialog.py:390
 msgid "Help translate"
 msgstr "Aita tõlkida"
 
-#: ayatanawebmail/dialog.py:406
-msgid "Project page"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:408
+#: /ayatanawebmail/dialog.py:392
 msgid "Source code"
 msgstr "Lähtekood"
 
-#: ayatanawebmail/dialog.py:410
-msgid "Repository"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:412
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr "Koduleht"
 
-#: ayatanawebmail/dialog.py:426
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr "Tõlkijad"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
-msgstr "Ayatana Webmail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+#, fuzzy
+msgid "Enable notifications"
+msgstr "Luba teavitused:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+#, fuzzy
+msgid "Play sound when new messages arrive."
+msgstr "Mängi sõnumi saabumisel heli:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+#, fuzzy
+msgid "Hide message count"
+msgstr "Ava sõnum/käivita käsk"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+#, fuzzy
+msgid "Run this command when new messages arrive."
+msgstr "Sõnumi saamisel käivita see käsk:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+#, fuzzy
+msgid "Custom sound"
+msgstr "Kohandatud heli, mida mängida:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+#, fuzzy
+msgid "Play a custom sound when new messages arrive."
+msgstr "Mängi sõnumi saabumisel heli:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+#, fuzzy
+msgid "Merge messages"
+msgstr "Märgi sõnum loetuks"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+#, fuzzy
+msgid "Merge messages belonging to the same conversation."
+msgstr "Ühenda sama vestluse sõnumid:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+#, fuzzy
+msgid "Message action"
+msgstr "Sõnumi tegevused"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+#, fuzzy
+msgid "Action to perform when a message is activated."
+msgstr "Kui sõnum on aktiveeritud:"
+
+#~ msgid ""
+#~ "Please visit the following link and enable access for less secure apps:"
+#~ msgstr ""
+#~ "Palun külasta järgnevat viita ja luba vähem turvaliste rakenduste "
+#~ "kasutamine:"
+
+#~ msgid "Access blocked by Google"
+#~ msgstr "Google juurdepääsu blokeering"
+
+#~ msgid "Choose an account"
+#~ msgstr "Vali konto"
+
+#~ msgid "Account data"
+#~ msgstr "Konto andmed"
+
+#~ msgid "Login:"
+#~ msgstr "Kasutajanimi:"
+
+#~ msgid "Ayatana Webmail"
+#~ msgstr "Ayatana Webmail"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:39
-msgid "Webmail notifications and actions for any desktop"
-msgstr "Veebimeili teavitused ja tegevused igale töölauale"
+#~ msgid "Webmail notifications and actions for any desktop"
+#~ msgstr "Veebimeili teavitused ja tegevused igale töölauale"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:74
-msgid "Mark all as read"
-msgstr "Märgi kõik loetuks"
+#~ msgid "Mark all as read"
+#~ msgstr "Märgi kõik loetuks"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:112
-msgid "Compose Mail"
-msgstr "Koosta kiri"
+#~ msgid "Compose Mail"
+#~ msgstr "Koosta kiri"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:152
-msgid "Sent"
-msgstr "Saadetud"
+#~ msgid "Sent"
+#~ msgstr "Saadetud"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:228
-msgid "Inbox"
-msgstr "Postkast"
+#~ msgid "Inbox"
+#~ msgstr "Postkast"
diff --git a/po/eu.po b/po/eu.po
index 0712200..d316eca 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -6,9 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail 22.6.28\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/"
-"issues\n"
-"POT-Creation-Date: 2020-08-22 20:15+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -18,300 +17,329 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr ""
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr ""
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr ""
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:204
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr ""
 
-#: ayatanawebmail/application.py:211
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr ""
 
-#: ayatanawebmail/application.py:218
-#: data/usr/share/applications/ayatana-webmail.desktop:35
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr ""
 
-#: ayatanawebmail/application.py:957
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:1110
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr ""
 
-#: ayatanawebmail/application.py:1111
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
-msgid "Unable to connect to account \"{accountName}\", the application will now exit."
+msgid ""
+"Unable to connect to account \"{accountName}\", the application will now "
+"exit."
 msgstr ""
 
-#: ayatanawebmail/application.py:1136
+#: /ayatanawebmail/application.py:1131
 #, python-format
-msgid "You have %d unread mail"
-msgid_plural "You have %d unread mails"
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ayatanawebmail/application.py:1163
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr ""
 
-#: ayatanawebmail/application.py:1165
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1167
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1180
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:60
-msgid "If this string starts with http:// or https://, the application will open it in your browser - otherwise, it will be run as a command"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:61
+msgid ""
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:90 ayatanawebmail/dialog.py:104
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:132
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:140
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:141
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:142
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:143
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:204
-msgid "Please visit the following link and enable access for less secure apps:"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:206
-msgid "Access blocked by Google"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:210
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:211
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:234
-msgid "Custom"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:242
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:244
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:286
-msgid "The application will append this string to \"Inbox\" to access a specific message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+#: /ayatanawebmail/dialog.py:276
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:288
+#: /ayatanawebmail/dialog.py:278
 msgid "Account:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:290
+#: /ayatanawebmail/dialog.py:280
 msgid "Server:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:292
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:294
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:296
+#: /ayatanawebmail/dialog.py:286
 msgid "Username:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:298
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:300
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:302
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:296
 msgid "Sent:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:308
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:310
+#: /ayatanawebmail/dialog.py:300
 msgid "Message:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:346
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:347
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:348
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:358
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:360
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:362
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:364
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:369
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:376
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:392
+#: /ayatanawebmail/dialog.py:382
 msgid "Report a bug"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:394
+#: /ayatanawebmail/dialog.py:384
 msgid "Request a feature"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:396 ayatanawebmail/dialog.py:399
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
 #, python-brace-format
 msgid "It's a good idea to add the {labelname} label to your issue."
 msgstr ""
 
-#: ayatanawebmail/dialog.py:397
+#: /ayatanawebmail/dialog.py:387
 msgid "Ask a question"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:400
+#: /ayatanawebmail/dialog.py:390
 msgid "Help translate"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:402
+#: /ayatanawebmail/dialog.py:392
 msgid "Source code"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:404
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:424
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+msgid "Enable notifications"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+msgid "Play sound when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+msgid "Hide message count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:5
-msgid "Display notifications about new mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+msgid "Run this command when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+msgid "Custom sound"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:5
-msgid "Webmail notifications and actions for any desktop"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+msgid "Play a custom sound when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:15
-msgid "Mark all as read"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+msgid "Merge messages"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:20
-msgid "Compose Mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+msgid "Merge messages belonging to the same conversation."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:25
-msgid "Sent"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+msgid "Message action"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:30
-msgid "Inbox"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+msgid "Action to perform when a message is activated."
 msgstr ""
diff --git a/po/fa.po b/po/fa.po
index 90d2ea4..bec2f2a 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -6,9 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail 22.6.28\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/"
-"issues\n"
-"POT-Creation-Date: 2020-08-22 20:15+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -18,300 +17,329 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr ""
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr ""
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr ""
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:204
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr ""
 
-#: ayatanawebmail/application.py:211
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr ""
 
-#: ayatanawebmail/application.py:218
-#: data/usr/share/applications/ayatana-webmail.desktop:35
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr ""
 
-#: ayatanawebmail/application.py:957
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:1110
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr ""
 
-#: ayatanawebmail/application.py:1111
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
-msgid "Unable to connect to account \"{accountName}\", the application will now exit."
+msgid ""
+"Unable to connect to account \"{accountName}\", the application will now "
+"exit."
 msgstr ""
 
-#: ayatanawebmail/application.py:1136
+#: /ayatanawebmail/application.py:1131
 #, python-format
-msgid "You have %d unread mail"
-msgid_plural "You have %d unread mails"
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ayatanawebmail/application.py:1163
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr ""
 
-#: ayatanawebmail/application.py:1165
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1167
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1180
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:60
-msgid "If this string starts with http:// or https://, the application will open it in your browser - otherwise, it will be run as a command"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:61
+msgid ""
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:90 ayatanawebmail/dialog.py:104
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:132
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:140
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:141
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:142
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:143
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:204
-msgid "Please visit the following link and enable access for less secure apps:"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:206
-msgid "Access blocked by Google"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:210
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:211
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:234
-msgid "Custom"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:242
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:244
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:286
-msgid "The application will append this string to \"Inbox\" to access a specific message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+#: /ayatanawebmail/dialog.py:276
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:288
+#: /ayatanawebmail/dialog.py:278
 msgid "Account:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:290
+#: /ayatanawebmail/dialog.py:280
 msgid "Server:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:292
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:294
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:296
+#: /ayatanawebmail/dialog.py:286
 msgid "Username:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:298
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:300
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:302
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:296
 msgid "Sent:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:308
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:310
+#: /ayatanawebmail/dialog.py:300
 msgid "Message:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:346
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:347
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:348
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:358
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:360
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:362
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:364
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:369
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:376
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:392
+#: /ayatanawebmail/dialog.py:382
 msgid "Report a bug"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:394
+#: /ayatanawebmail/dialog.py:384
 msgid "Request a feature"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:396 ayatanawebmail/dialog.py:399
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
 #, python-brace-format
 msgid "It's a good idea to add the {labelname} label to your issue."
 msgstr ""
 
-#: ayatanawebmail/dialog.py:397
+#: /ayatanawebmail/dialog.py:387
 msgid "Ask a question"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:400
+#: /ayatanawebmail/dialog.py:390
 msgid "Help translate"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:402
+#: /ayatanawebmail/dialog.py:392
 msgid "Source code"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:404
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:424
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+msgid "Enable notifications"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+msgid "Play sound when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+msgid "Hide message count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:5
-msgid "Display notifications about new mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+msgid "Run this command when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+msgid "Custom sound"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:5
-msgid "Webmail notifications and actions for any desktop"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+msgid "Play a custom sound when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:15
-msgid "Mark all as read"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+msgid "Merge messages"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:20
-msgid "Compose Mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+msgid "Merge messages belonging to the same conversation."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:25
-msgid "Sent"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+msgid "Message action"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:30
-msgid "Inbox"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+msgid "Action to perform when a message is activated."
 msgstr ""
diff --git a/po/fi.po b/po/fi.po
index da4e324..a43f652 100755
--- a/po/fi.po
+++ b/po/fi.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/issues\n"
-"POT-Creation-Date: 2020-04-03 12:21+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: 2018-06-04 07:34+0000\n"
 "Language-Team: Finnish <fi@li.org>\n"
+"Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -17,312 +18,353 @@ msgstr ""
 "X-Launchpad-Export-Date: 2020-04-04 05:58+0000\n"
 "X-Generator: Launchpad (build a296f04231dee355be5db73cc878b9e21689a253)\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr ""
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr ""
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr ""
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:205
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr ""
 
-#: ayatanawebmail/application.py:212
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr ""
 
-#: ayatanawebmail/application.py:219
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr ""
 
-#: ayatanawebmail/application.py:980
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr "Ei aihetta"
 
-#: ayatanawebmail/application.py:1132
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr ""
 
-#: ayatanawebmail/application.py:1133
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
 msgid ""
 "Unable to connect to account \"{accountName}\", the application will now "
 "exit."
 msgstr ""
 
-#: ayatanawebmail/application.py:1133
-#, python-brace-format
-msgid "You can run \"{command}\" to delete all your login settings."
-msgstr ""
-
-#: ayatanawebmail/application.py:1158
-#, python-format
-msgid "You have %d unread mail"
-msgid_plural "You have %d unread mails"
+#: /ayatanawebmail/application.py:1131
+#, fuzzy, python-format
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
 msgstr[0] "%d lukematon sähköposti"
 msgstr[1] "%d lukematonta sähköpostia"
 
-#: ayatanawebmail/application.py:1185
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr ""
 
-#: ayatanawebmail/application.py:1187
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1189
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1202
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr "Uutta sähköpostia osoitteesta %s"
 
-#: ayatanawebmail/dialog.py:60
-msgid "Web page"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:61
-msgid "Command"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:93
+#: /ayatanawebmail/dialog.py:61
 msgid ""
-"Append an additional string - you can use the $MSG_THREAD and $MSG_UID "
-"placeholders."
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:114 ayatanawebmail/dialog.py:128
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:156
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:164
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr "Tilit"
 
-#: ayatanawebmail/dialog.py:165
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr "Asetukset"
 
-#: ayatanawebmail/dialog.py:166
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:167
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:228
-msgid ""
-"Please visit the following link and enable access for less secure apps:"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:230
-msgid "Access blocked by Google"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:234
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:235
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:254
-msgid "Choose an account"
-msgstr "Valitse tili"
-
-#: ayatanawebmail/dialog.py:259
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:261
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:276
-msgid "Server data"
-msgstr "Palvelintiedot"
+#: /ayatanawebmail/dialog.py:276
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+msgstr ""
 
-#: ayatanawebmail/dialog.py:278
-msgid "Account data"
-msgstr "Tilitiedot"
+#: /ayatanawebmail/dialog.py:278
+#, fuzzy
+msgid "Account:"
+msgstr "Tilit"
 
-#: ayatanawebmail/dialog.py:289
-msgid "Links"
-msgstr ""
+#: /ayatanawebmail/dialog.py:280
+#, fuzzy
+msgid "Server:"
+msgstr "Palvelintiedot"
 
-#: ayatanawebmail/dialog.py:297
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr "Palvelin:"
 
-#: ayatanawebmail/dialog.py:299
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr "Portti:"
 
-#: ayatanawebmail/dialog.py:302
-msgid "Login:"
-msgstr "Käyttäjätunnus:"
+#: /ayatanawebmail/dialog.py:286
+msgid "Username:"
+msgstr ""
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr "Salasana:"
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:309
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr "Koti:"
 
-#: ayatanawebmail/dialog.py:311
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr "Lähetä:"
 
-#: ayatanawebmail/dialog.py:313
+#: /ayatanawebmail/dialog.py:296
+msgid "Sent:"
+msgstr "Lähetetyt:"
+
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr "Saapuneet:"
 
-#: ayatanawebmail/dialog.py:316
-msgid "Sent:"
-msgstr "Lähetetyt:"
+#: /ayatanawebmail/dialog.py:300
+msgid "Message:"
+msgstr ""
 
-#: ayatanawebmail/dialog.py:354
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:355
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:356
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr "Käytä ilmoituksia:"
 
-#: ayatanawebmail/dialog.py:368
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:370
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:372
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:374
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:377
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:384
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:400
-msgid "Report a bug/Request a feature"
+#: /ayatanawebmail/dialog.py:382
+msgid "Report a bug"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:402
-msgid "Ask a question"
+#: /ayatanawebmail/dialog.py:384
+msgid "Request a feature"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:404
-msgid "Help translate"
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
+#, python-brace-format
+msgid "It's a good idea to add the {labelname} label to your issue."
 msgstr ""
 
-#: ayatanawebmail/dialog.py:406
-msgid "Project page"
+#: /ayatanawebmail/dialog.py:387
+msgid "Ask a question"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:408
-msgid "Source code"
+#: /ayatanawebmail/dialog.py:390
+msgid "Help translate"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:410
-msgid "Repository"
+#: /ayatanawebmail/dialog.py:392
+msgid "Source code"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:412
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:426
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:39
-msgid "Webmail notifications and actions for any desktop"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+#, fuzzy
+msgid "Enable notifications"
+msgstr "Käytä ilmoituksia:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:74
-msgid "Mark all as read"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:112
-msgid "Compose Mail"
-msgstr "Lähetä sähköpostiviesti"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+msgid "Play sound when new messages arrive."
+msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:152
-msgid "Sent"
-msgstr "Lähetetyt"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+msgid "Hide message count"
+msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:228
-msgid "Inbox"
-msgstr "Saapuneet"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+msgid "Run this command when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+msgid "Custom sound"
+msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+msgid "Play a custom sound when new messages arrive."
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:38
-msgid "Display notifications about new mail"
-msgstr "Näytä ilmoitus uusista sähköpostiviesteistä"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+msgid "Merge messages"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+msgid "Merge messages belonging to the same conversation."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+msgid "Message action"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+msgid "Action to perform when a message is activated."
+msgstr ""
+
+#~ msgid "Choose an account"
+#~ msgstr "Valitse tili"
+
+#~ msgid "Account data"
+#~ msgstr "Tilitiedot"
+
+#~ msgid "Login:"
+#~ msgstr "Käyttäjätunnus:"
+
+#~ msgid "Compose Mail"
+#~ msgstr "Lähetä sähköpostiviesti"
+
+#~ msgid "Sent"
+#~ msgstr "Lähetetyt"
+
+#~ msgid "Inbox"
+#~ msgstr "Saapuneet"
+
+#~ msgid "Display notifications about new mail"
+#~ msgstr "Näytä ilmoitus uusista sähköpostiviesteistä"
diff --git a/po/fil.po b/po/fil.po
index a70deb2..7b261d1 100644
--- a/po/fil.po
+++ b/po/fil.po
@@ -6,9 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail 22.6.28\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/"
-"issues\n"
-"POT-Creation-Date: 2020-08-22 20:15+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -19,300 +18,329 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1 && n != 2 && n != 3 && (n % 10 == 4 "
 "|| n % 10 == 6 || n % 10 == 9);\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr ""
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr ""
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr ""
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:204
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr ""
 
-#: ayatanawebmail/application.py:211
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr ""
 
-#: ayatanawebmail/application.py:218
-#: data/usr/share/applications/ayatana-webmail.desktop:35
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr ""
 
-#: ayatanawebmail/application.py:957
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:1110
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr ""
 
-#: ayatanawebmail/application.py:1111
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
-msgid "Unable to connect to account \"{accountName}\", the application will now exit."
+msgid ""
+"Unable to connect to account \"{accountName}\", the application will now "
+"exit."
 msgstr ""
 
-#: ayatanawebmail/application.py:1136
+#: /ayatanawebmail/application.py:1131
 #, python-format
-msgid "You have %d unread mail"
-msgid_plural "You have %d unread mails"
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ayatanawebmail/application.py:1163
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr ""
 
-#: ayatanawebmail/application.py:1165
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1167
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1180
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:60
-msgid "If this string starts with http:// or https://, the application will open it in your browser - otherwise, it will be run as a command"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:61
+msgid ""
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:90 ayatanawebmail/dialog.py:104
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:132
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:140
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:141
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:142
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:143
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:204
-msgid "Please visit the following link and enable access for less secure apps:"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:206
-msgid "Access blocked by Google"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:210
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:211
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:234
-msgid "Custom"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:242
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:244
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:286
-msgid "The application will append this string to \"Inbox\" to access a specific message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+#: /ayatanawebmail/dialog.py:276
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:288
+#: /ayatanawebmail/dialog.py:278
 msgid "Account:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:290
+#: /ayatanawebmail/dialog.py:280
 msgid "Server:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:292
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:294
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:296
+#: /ayatanawebmail/dialog.py:286
 msgid "Username:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:298
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:300
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:302
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:296
 msgid "Sent:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:308
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:310
+#: /ayatanawebmail/dialog.py:300
 msgid "Message:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:346
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:347
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:348
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:358
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:360
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:362
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:364
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:369
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:376
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:392
+#: /ayatanawebmail/dialog.py:382
 msgid "Report a bug"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:394
+#: /ayatanawebmail/dialog.py:384
 msgid "Request a feature"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:396 ayatanawebmail/dialog.py:399
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
 #, python-brace-format
 msgid "It's a good idea to add the {labelname} label to your issue."
 msgstr ""
 
-#: ayatanawebmail/dialog.py:397
+#: /ayatanawebmail/dialog.py:387
 msgid "Ask a question"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:400
+#: /ayatanawebmail/dialog.py:390
 msgid "Help translate"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:402
+#: /ayatanawebmail/dialog.py:392
 msgid "Source code"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:404
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:424
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+msgid "Enable notifications"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+msgid "Play sound when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+msgid "Hide message count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:5
-msgid "Display notifications about new mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+msgid "Run this command when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+msgid "Custom sound"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:5
-msgid "Webmail notifications and actions for any desktop"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+msgid "Play a custom sound when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:15
-msgid "Mark all as read"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+msgid "Merge messages"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:20
-msgid "Compose Mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+msgid "Merge messages belonging to the same conversation."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:25
-msgid "Sent"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+msgid "Message action"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:30
-msgid "Inbox"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+msgid "Action to perform when a message is activated."
 msgstr ""
diff --git a/po/fo.po b/po/fo.po
index 864eeeb..9a961b5 100644
--- a/po/fo.po
+++ b/po/fo.po
@@ -6,9 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail 22.6.28\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/"
-"issues\n"
-"POT-Creation-Date: 2020-08-22 20:15+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -18,300 +17,329 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr ""
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr ""
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr ""
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:204
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr ""
 
-#: ayatanawebmail/application.py:211
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr ""
 
-#: ayatanawebmail/application.py:218
-#: data/usr/share/applications/ayatana-webmail.desktop:35
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr ""
 
-#: ayatanawebmail/application.py:957
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:1110
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr ""
 
-#: ayatanawebmail/application.py:1111
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
-msgid "Unable to connect to account \"{accountName}\", the application will now exit."
+msgid ""
+"Unable to connect to account \"{accountName}\", the application will now "
+"exit."
 msgstr ""
 
-#: ayatanawebmail/application.py:1136
+#: /ayatanawebmail/application.py:1131
 #, python-format
-msgid "You have %d unread mail"
-msgid_plural "You have %d unread mails"
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ayatanawebmail/application.py:1163
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr ""
 
-#: ayatanawebmail/application.py:1165
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1167
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1180
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:60
-msgid "If this string starts with http:// or https://, the application will open it in your browser - otherwise, it will be run as a command"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:61
+msgid ""
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:90 ayatanawebmail/dialog.py:104
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:132
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:140
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:141
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:142
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:143
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:204
-msgid "Please visit the following link and enable access for less secure apps:"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:206
-msgid "Access blocked by Google"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:210
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:211
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:234
-msgid "Custom"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:242
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:244
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:286
-msgid "The application will append this string to \"Inbox\" to access a specific message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+#: /ayatanawebmail/dialog.py:276
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:288
+#: /ayatanawebmail/dialog.py:278
 msgid "Account:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:290
+#: /ayatanawebmail/dialog.py:280
 msgid "Server:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:292
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:294
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:296
+#: /ayatanawebmail/dialog.py:286
 msgid "Username:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:298
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:300
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:302
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:296
 msgid "Sent:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:308
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:310
+#: /ayatanawebmail/dialog.py:300
 msgid "Message:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:346
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:347
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:348
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:358
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:360
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:362
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:364
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:369
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:376
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:392
+#: /ayatanawebmail/dialog.py:382
 msgid "Report a bug"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:394
+#: /ayatanawebmail/dialog.py:384
 msgid "Request a feature"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:396 ayatanawebmail/dialog.py:399
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
 #, python-brace-format
 msgid "It's a good idea to add the {labelname} label to your issue."
 msgstr ""
 
-#: ayatanawebmail/dialog.py:397
+#: /ayatanawebmail/dialog.py:387
 msgid "Ask a question"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:400
+#: /ayatanawebmail/dialog.py:390
 msgid "Help translate"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:402
+#: /ayatanawebmail/dialog.py:392
 msgid "Source code"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:404
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:424
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+msgid "Enable notifications"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+msgid "Play sound when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+msgid "Hide message count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:5
-msgid "Display notifications about new mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+msgid "Run this command when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+msgid "Custom sound"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:5
-msgid "Webmail notifications and actions for any desktop"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+msgid "Play a custom sound when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:15
-msgid "Mark all as read"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+msgid "Merge messages"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:20
-msgid "Compose Mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+msgid "Merge messages belonging to the same conversation."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:25
-msgid "Sent"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+msgid "Message action"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:30
-msgid "Inbox"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+msgid "Action to perform when a message is activated."
 msgstr ""
diff --git a/po/fr.po b/po/fr.po
index cef836a..ef0659d 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,13 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/"
-"issues\n"
-"POT-Creation-Date: 2020-04-03 12:21+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: 2021-02-20 01:50+0000\n"
 "Last-Translator: J. Lavoie <j.lavoie@net-c.ca>\n"
-"Language-Team: French <https://hosted.weblate.org/projects/"
-"ayatana-indicators/ayatana-webmail/fr/>\n"
+"Language-Team: French <https://hosted.weblate.org/projects/ayatana-"
+"indicators/ayatana-webmail/fr/>\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,59 +20,59 @@ msgstr ""
 "X-Generator: Weblate 4.5\n"
 "X-Launchpad-Export-Date: 2020-05-18 06:03+0000\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr "Sélectionner un compte"
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr "Quelle commande/page web du compte voulez-vous ouvrir ?"
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr "Actions sur les messages"
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr "Supprimer"
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr "Marquer comme lu"
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr "Ouvrir le message/lancer une commande"
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr "Expéditeur"
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr "Objet"
 
-#: ayatanawebmail/application.py:205
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr "Ouvrir la page d'accueil de la messagerie"
 
-#: ayatanawebmail/application.py:212
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr "Effacer"
 
-#: ayatanawebmail/application.py:219
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr "Paramètres"
 
-#: ayatanawebmail/application.py:980
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr "Pas d'objet"
 
-#: ayatanawebmail/application.py:1132
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr "Erreur de connexion"
 
-#: ayatanawebmail/application.py:1133
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
 msgid ""
 "Unable to connect to account \"{accountName}\", the application will now "
@@ -82,261 +81,354 @@ msgstr ""
 "Impossible de se connecter au compte « {accountName} », l'application va "
 "maintenant se fermer."
 
-#: ayatanawebmail/application.py:1133
-#, python-brace-format
-msgid "You can run \"{command}\" to delete all your login settings."
-msgstr ""
-"Vous pouvez lancer « {command} » pour effacer tous vos réglages de connexion."
-
-#: ayatanawebmail/application.py:1158
-#, python-format
-msgid "You have %d unread mail"
-msgid_plural "You have %d unread mails"
+#: /ayatanawebmail/application.py:1131
+#, fuzzy, python-format
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
 msgstr[0] "Vous avez %d courriel non lu"
 msgstr[1] "Vous avez %d courriels non lus"
 
-#: ayatanawebmail/application.py:1185
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr "de %(t0)s, %(t1)s et autres"
 
-#: ayatanawebmail/application.py:1187
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr "de %(t0)s et %(t1)s"
 
-#: ayatanawebmail/application.py:1189
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr "de %s"
 
-#: ayatanawebmail/application.py:1202
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr "Nouveau courriel de %s"
 
-#: ayatanawebmail/dialog.py:60
-msgid "Web page"
-msgstr "Page web"
-
-#: ayatanawebmail/dialog.py:61
-msgid "Command"
-msgstr "Commande"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
+msgstr ""
 
-#: ayatanawebmail/dialog.py:93
+#: /ayatanawebmail/dialog.py:61
 msgid ""
-"Append an additional string - you can use the $MSG_THREAD and $MSG_UID "
-"placeholders."
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
-"Ajoutez une chaîne supplémentaire - vous pouvez utiliser les variables "
-"spéciales $MSG_THREAD et $MSG_UID."
 
-#: ayatanawebmail/dialog.py:114 ayatanawebmail/dialog.py:128
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr "(Aucun)"
 
-#: ayatanawebmail/dialog.py:156
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr "Préférences de la Messagerie Ayatana"
 
-#: ayatanawebmail/dialog.py:164
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr "Comptes"
 
-#: ayatanawebmail/dialog.py:165
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr "Options"
 
-#: ayatanawebmail/dialog.py:166
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr "Assistance"
 
-#: ayatanawebmail/dialog.py:167
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr "À propos"
 
-#: ayatanawebmail/dialog.py:228
-msgid ""
-"Please visit the following link and enable access for less secure apps:"
-msgstr ""
-"Veuillez visiter le lien suivant et permettre l'accès des applications moins "
-"sécurisées :"
-
-#: ayatanawebmail/dialog.py:230
-msgid "Access blocked by Google"
-msgstr "Accès bloqué par Google"
-
-#: ayatanawebmail/dialog.py:234
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr "Impossible de se connecter au compte. Erreur retournée :"
 
-#: ayatanawebmail/dialog.py:235
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr "Échec de la connexion"
 
-#: ayatanawebmail/dialog.py:254
-msgid "Choose an account"
-msgstr "Choisir un compte"
-
-#: ayatanawebmail/dialog.py:259
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr "Ajouter"
 
-#: ayatanawebmail/dialog.py:261
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr "Retirer"
 
-#: ayatanawebmail/dialog.py:276
-msgid "Server data"
-msgstr "Données du serveur"
+#: /ayatanawebmail/dialog.py:276
+#, fuzzy
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+msgstr ""
+"Ajoutez une chaîne supplémentaire - vous pouvez utiliser les variables "
+"spéciales $MSG_THREAD et $MSG_UID."
 
-#: ayatanawebmail/dialog.py:278
-msgid "Account data"
-msgstr "Données du compte"
+#: /ayatanawebmail/dialog.py:278
+#, fuzzy
+msgid "Account:"
+msgstr "Comptes"
 
-#: ayatanawebmail/dialog.py:289
-msgid "Links"
-msgstr "Liens"
+#: /ayatanawebmail/dialog.py:280
+#, fuzzy
+msgid "Server:"
+msgstr "Données du serveur"
 
-#: ayatanawebmail/dialog.py:297
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr "Hôte :"
 
-#: ayatanawebmail/dialog.py:299
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr "Port :"
 
-#: ayatanawebmail/dialog.py:302
-msgid "Login:"
-msgstr "Nom d'utilisateur :"
+#: /ayatanawebmail/dialog.py:286
+msgid "Username:"
+msgstr ""
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr "Mot de passe :"
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr "Dossier :"
 
-#: ayatanawebmail/dialog.py:309
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr "Accueil :"
 
-#: ayatanawebmail/dialog.py:311
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr "Composer :"
 
-#: ayatanawebmail/dialog.py:313
+#: /ayatanawebmail/dialog.py:296
+msgid "Sent:"
+msgstr "Messages envoyés :"
+
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr "Boîte de réception :"
 
-#: ayatanawebmail/dialog.py:316
-msgid "Sent:"
-msgstr "Messages envoyés :"
+#: /ayatanawebmail/dialog.py:300
+#, fuzzy
+msgid "Message:"
+msgstr "Actions sur les messages"
 
-#: ayatanawebmail/dialog.py:354
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr "Marquer comme lu"
 
-#: ayatanawebmail/dialog.py:355
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr "Ouvrir le message dans le navigateur/exécuter une commande"
 
-#: ayatanawebmail/dialog.py:356
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr "Me demander quoi faire"
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr "Activer les notifications :"
 
-#: ayatanawebmail/dialog.py:368
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr "Jouer un son à la reception d'un message :"
 
-#: ayatanawebmail/dialog.py:370
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr "Fusionner les messages de la même conversation :"
 
-#: ayatanawebmail/dialog.py:372
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr "Masquer le compteur lorsqu'il est à zero :"
 
-#: ayatanawebmail/dialog.py:374
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr "Quand un message est selectionné :"
 
-#: ayatanawebmail/dialog.py:377
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr "Exécuter cette commande quand un message est arrivé :"
 
-#: ayatanawebmail/dialog.py:384
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr "Son personnalisé à jouer :"
 
-#: ayatanawebmail/dialog.py:400
-msgid "Report a bug/Request a feature"
+#: /ayatanawebmail/dialog.py:382
+msgid "Report a bug"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:384
+#, fuzzy
+msgid "Request a feature"
 msgstr "Signaler un bogue/demander une fonctionnalité"
 
-#: ayatanawebmail/dialog.py:402
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
+#, python-brace-format
+msgid "It's a good idea to add the {labelname} label to your issue."
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:387
 msgid "Ask a question"
 msgstr "Poser une question"
 
-#: ayatanawebmail/dialog.py:404
+#: /ayatanawebmail/dialog.py:390
 msgid "Help translate"
 msgstr "Aider à la traduction"
 
-#: ayatanawebmail/dialog.py:406
-msgid "Project page"
-msgstr "Page web du projet"
-
-#: ayatanawebmail/dialog.py:408
+#: /ayatanawebmail/dialog.py:392
 msgid "Source code"
 msgstr "Code source"
 
-#: ayatanawebmail/dialog.py:410
-msgid "Repository"
-msgstr "Dépôt"
-
-#: ayatanawebmail/dialog.py:412
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr "Page d’accueil"
 
-#: ayatanawebmail/dialog.py:426
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr ""
 "Contributions  Launchpad :\n"
 "  Jean-Marc https://launchpad.net/~m-balthazar\n"
 "  rcspam https://launchpad.net/~rcspam"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
-msgstr "Messagerie Ayatana"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+#, fuzzy
+msgid "Enable notifications"
+msgstr "Activer les notifications :"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+#, fuzzy
+msgid "Play sound when new messages arrive."
+msgstr "Jouer un son à la reception d'un message :"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+#, fuzzy
+msgid "Hide message count"
+msgstr "Ouvrir le message/lancer une commande"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+#, fuzzy
+msgid "Run this command when new messages arrive."
+msgstr "Exécuter cette commande quand un message est arrivé :"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+#, fuzzy
+msgid "Custom sound"
+msgstr "Son personnalisé à jouer :"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+#, fuzzy
+msgid "Play a custom sound when new messages arrive."
+msgstr "Jouer un son à la reception d'un message :"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+#, fuzzy
+msgid "Merge messages"
+msgstr "Marquer comme lu"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+#, fuzzy
+msgid "Merge messages belonging to the same conversation."
+msgstr "Fusionner les messages de la même conversation :"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+#, fuzzy
+msgid "Message action"
+msgstr "Actions sur les messages"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+#, fuzzy
+msgid "Action to perform when a message is activated."
+msgstr "Quand un message est selectionné :"
+
+#, python-brace-format
+#~ msgid "You can run \"{command}\" to delete all your login settings."
+#~ msgstr ""
+#~ "Vous pouvez lancer « {command} » pour effacer tous vos réglages de "
+#~ "connexion."
+
+#~ msgid "Web page"
+#~ msgstr "Page web"
+
+#~ msgid "Command"
+#~ msgstr "Commande"
+
+#~ msgid ""
+#~ "Please visit the following link and enable access for less secure apps:"
+#~ msgstr ""
+#~ "Veuillez visiter le lien suivant et permettre l'accès des applications "
+#~ "moins sécurisées :"
+
+#~ msgid "Access blocked by Google"
+#~ msgstr "Accès bloqué par Google"
+
+#~ msgid "Choose an account"
+#~ msgstr "Choisir un compte"
+
+#~ msgid "Account data"
+#~ msgstr "Données du compte"
+
+#~ msgid "Links"
+#~ msgstr "Liens"
+
+#~ msgid "Login:"
+#~ msgstr "Nom d'utilisateur :"
+
+#~ msgid "Project page"
+#~ msgstr "Page web du projet"
+
+#~ msgid "Repository"
+#~ msgstr "Dépôt"
+
+#~ msgid "Ayatana Webmail"
+#~ msgstr "Messagerie Ayatana"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:39
-msgid "Webmail notifications and actions for any desktop"
-msgstr "Notifications et actions de messagerie Web pour n'importe quel bureau"
+#~ msgid "Webmail notifications and actions for any desktop"
+#~ msgstr ""
+#~ "Notifications et actions de messagerie Web pour n'importe quel bureau"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:74
-msgid "Mark all as read"
-msgstr "Tout marquer comme lu"
+#~ msgid "Mark all as read"
+#~ msgstr "Tout marquer comme lu"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:112
-msgid "Compose Mail"
-msgstr "Nouveau message"
+#~ msgid "Compose Mail"
+#~ msgstr "Nouveau message"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:152
-msgid "Sent"
-msgstr "Messages envoyés"
+#~ msgid "Sent"
+#~ msgstr "Messages envoyés"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:228
-msgid "Inbox"
-msgstr "Boîte de réception"
+#~ msgid "Inbox"
+#~ msgstr "Boîte de réception"
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
-msgstr "Messagerie Ayatana (service)"
+#~ msgid "Ayatana Webmail (service)"
+#~ msgstr "Messagerie Ayatana (service)"
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:38
-msgid "Display notifications about new mail"
-msgstr "Afficher les alertes de nouveaux courriels"
+#~ msgid "Display notifications about new mail"
+#~ msgstr "Afficher les alertes de nouveaux courriels"
diff --git a/po/fr_CA.po b/po/fr_CA.po
index 5ee98de..7aa0e4f 100644
--- a/po/fr_CA.po
+++ b/po/fr_CA.po
@@ -6,13 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail 22.6.28\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/"
-"issues\n"
-"POT-Creation-Date: 2020-08-22 20:15+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: 2020-12-31 03:29+0000\n"
 "Last-Translator: J. Lavoie <j.lavoie@net-c.ca>\n"
-"Language-Team: French (Canada) <https://hosted.weblate.org/projects/"
-"ayatana-indicators/ayatana-webmail/fr_CA/>\n"
+"Language-Team: French (Canada) <https://hosted.weblate.org/projects/ayatana-"
+"indicators/ayatana-webmail/fr_CA/>\n"
 "Language: fr_CA\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,305 +19,334 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 "X-Generator: Weblate 4.4.1-dev\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr ""
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr ""
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr ""
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:204
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr ""
 
-#: ayatanawebmail/application.py:211
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr "Effacer"
 
-#: ayatanawebmail/application.py:218
-#: data/usr/share/applications/ayatana-webmail.desktop:35
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr "Paramètres"
 
-#: ayatanawebmail/application.py:957
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:1110
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr ""
 
-#: ayatanawebmail/application.py:1111
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
-msgid "Unable to connect to account \"{accountName}\", the application will now exit."
+msgid ""
+"Unable to connect to account \"{accountName}\", the application will now "
+"exit."
 msgstr ""
 "Impossible de se connecter au compte « {accountName} », l'application va "
 "maintenant se fermer."
 
-#: ayatanawebmail/application.py:1136
+#: /ayatanawebmail/application.py:1131
 #, python-format
-msgid "You have %d unread mail"
-msgid_plural "You have %d unread mails"
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ayatanawebmail/application.py:1163
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr ""
 
-#: ayatanawebmail/application.py:1165
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1167
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1180
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:60
-msgid "If this string starts with http:// or https://, the application will open it in your browser - otherwise, it will be run as a command"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:61
+msgid ""
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:90 ayatanawebmail/dialog.py:104
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:132
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:140
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:141
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:142
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:143
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:204
-msgid "Please visit the following link and enable access for less secure apps:"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:206
-msgid "Access blocked by Google"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:210
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:211
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:234
-msgid "Custom"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:242
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:244
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:286
-msgid "The application will append this string to \"Inbox\" to access a specific message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+#: /ayatanawebmail/dialog.py:276
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
 msgstr ""
 "L'application ajoutera cette chaîne à « Boîte de réception » pour accéder à "
 "un message spécifique – vous pouvez utiliser les espaces réservés $ "
 "MSG_THREAD et $ MSG_UID"
 
-#: ayatanawebmail/dialog.py:288
+#: /ayatanawebmail/dialog.py:278
 msgid "Account:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:290
+#: /ayatanawebmail/dialog.py:280
 msgid "Server:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:292
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:294
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:296
+#: /ayatanawebmail/dialog.py:286
 msgid "Username:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:298
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:300
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:302
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:296
 msgid "Sent:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:308
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:310
+#: /ayatanawebmail/dialog.py:300
 msgid "Message:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:346
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:347
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:348
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:358
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:360
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:362
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:364
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:369
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:376
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:392
+#: /ayatanawebmail/dialog.py:382
 msgid "Report a bug"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:394
+#: /ayatanawebmail/dialog.py:384
 msgid "Request a feature"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:396 ayatanawebmail/dialog.py:399
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
 #, python-brace-format
 msgid "It's a good idea to add the {labelname} label to your issue."
 msgstr ""
 
-#: ayatanawebmail/dialog.py:397
+#: /ayatanawebmail/dialog.py:387
 msgid "Ask a question"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:400
+#: /ayatanawebmail/dialog.py:390
 msgid "Help translate"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:402
+#: /ayatanawebmail/dialog.py:392
 msgid "Source code"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:404
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:424
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+msgid "Enable notifications"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+msgid "Play sound when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+msgid "Hide message count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:5
-msgid "Display notifications about new mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+msgid "Run this command when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+msgid "Custom sound"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:5
-msgid "Webmail notifications and actions for any desktop"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+msgid "Play a custom sound when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:15
-msgid "Mark all as read"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+msgid "Merge messages"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:20
-msgid "Compose Mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+msgid "Merge messages belonging to the same conversation."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:25
-msgid "Sent"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+msgid "Message action"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:30
-msgid "Inbox"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+msgid "Action to perform when a message is activated."
 msgstr ""
diff --git a/po/frp.po b/po/frp.po
index 704547e..30c7187 100644
--- a/po/frp.po
+++ b/po/frp.po
@@ -6,9 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail 22.6.28\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/"
-"issues\n"
-"POT-Creation-Date: 2020-08-22 20:15+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -18,300 +17,329 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr ""
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr ""
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr ""
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:204
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr ""
 
-#: ayatanawebmail/application.py:211
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr ""
 
-#: ayatanawebmail/application.py:218
-#: data/usr/share/applications/ayatana-webmail.desktop:35
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr ""
 
-#: ayatanawebmail/application.py:957
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:1110
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr ""
 
-#: ayatanawebmail/application.py:1111
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
-msgid "Unable to connect to account \"{accountName}\", the application will now exit."
+msgid ""
+"Unable to connect to account \"{accountName}\", the application will now "
+"exit."
 msgstr ""
 
-#: ayatanawebmail/application.py:1136
+#: /ayatanawebmail/application.py:1131
 #, python-format
-msgid "You have %d unread mail"
-msgid_plural "You have %d unread mails"
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ayatanawebmail/application.py:1163
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr ""
 
-#: ayatanawebmail/application.py:1165
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1167
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1180
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:60
-msgid "If this string starts with http:// or https://, the application will open it in your browser - otherwise, it will be run as a command"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:61
+msgid ""
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:90 ayatanawebmail/dialog.py:104
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:132
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:140
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:141
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:142
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:143
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:204
-msgid "Please visit the following link and enable access for less secure apps:"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:206
-msgid "Access blocked by Google"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:210
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:211
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:234
-msgid "Custom"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:242
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:244
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:286
-msgid "The application will append this string to \"Inbox\" to access a specific message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+#: /ayatanawebmail/dialog.py:276
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:288
+#: /ayatanawebmail/dialog.py:278
 msgid "Account:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:290
+#: /ayatanawebmail/dialog.py:280
 msgid "Server:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:292
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:294
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:296
+#: /ayatanawebmail/dialog.py:286
 msgid "Username:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:298
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:300
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:302
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:296
 msgid "Sent:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:308
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:310
+#: /ayatanawebmail/dialog.py:300
 msgid "Message:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:346
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:347
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:348
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:358
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:360
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:362
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:364
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:369
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:376
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:392
+#: /ayatanawebmail/dialog.py:382
 msgid "Report a bug"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:394
+#: /ayatanawebmail/dialog.py:384
 msgid "Request a feature"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:396 ayatanawebmail/dialog.py:399
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
 #, python-brace-format
 msgid "It's a good idea to add the {labelname} label to your issue."
 msgstr ""
 
-#: ayatanawebmail/dialog.py:397
+#: /ayatanawebmail/dialog.py:387
 msgid "Ask a question"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:400
+#: /ayatanawebmail/dialog.py:390
 msgid "Help translate"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:402
+#: /ayatanawebmail/dialog.py:392
 msgid "Source code"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:404
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:424
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+msgid "Enable notifications"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+msgid "Play sound when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+msgid "Hide message count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:5
-msgid "Display notifications about new mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+msgid "Run this command when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+msgid "Custom sound"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:5
-msgid "Webmail notifications and actions for any desktop"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+msgid "Play a custom sound when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:15
-msgid "Mark all as read"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+msgid "Merge messages"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:20
-msgid "Compose Mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+msgid "Merge messages belonging to the same conversation."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:25
-msgid "Sent"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+msgid "Message action"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:30
-msgid "Inbox"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+msgid "Action to perform when a message is activated."
 msgstr ""
diff --git a/po/fur.po b/po/fur.po
index d91ece4..ebeca05 100644
--- a/po/fur.po
+++ b/po/fur.po
@@ -6,9 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail 22.6.28\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/"
-"issues\n"
-"POT-Creation-Date: 2020-08-22 20:15+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -18,300 +17,329 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr ""
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr ""
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr ""
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:204
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr ""
 
-#: ayatanawebmail/application.py:211
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr ""
 
-#: ayatanawebmail/application.py:218
-#: data/usr/share/applications/ayatana-webmail.desktop:35
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr ""
 
-#: ayatanawebmail/application.py:957
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:1110
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr ""
 
-#: ayatanawebmail/application.py:1111
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
-msgid "Unable to connect to account \"{accountName}\", the application will now exit."
+msgid ""
+"Unable to connect to account \"{accountName}\", the application will now "
+"exit."
 msgstr ""
 
-#: ayatanawebmail/application.py:1136
+#: /ayatanawebmail/application.py:1131
 #, python-format
-msgid "You have %d unread mail"
-msgid_plural "You have %d unread mails"
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ayatanawebmail/application.py:1163
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr ""
 
-#: ayatanawebmail/application.py:1165
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1167
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1180
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:60
-msgid "If this string starts with http:// or https://, the application will open it in your browser - otherwise, it will be run as a command"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:61
+msgid ""
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:90 ayatanawebmail/dialog.py:104
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:132
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:140
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:141
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:142
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:143
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:204
-msgid "Please visit the following link and enable access for less secure apps:"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:206
-msgid "Access blocked by Google"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:210
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:211
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:234
-msgid "Custom"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:242
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:244
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:286
-msgid "The application will append this string to \"Inbox\" to access a specific message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+#: /ayatanawebmail/dialog.py:276
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:288
+#: /ayatanawebmail/dialog.py:278
 msgid "Account:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:290
+#: /ayatanawebmail/dialog.py:280
 msgid "Server:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:292
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:294
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:296
+#: /ayatanawebmail/dialog.py:286
 msgid "Username:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:298
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:300
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:302
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:296
 msgid "Sent:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:308
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:310
+#: /ayatanawebmail/dialog.py:300
 msgid "Message:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:346
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:347
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:348
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:358
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:360
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:362
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:364
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:369
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:376
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:392
+#: /ayatanawebmail/dialog.py:382
 msgid "Report a bug"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:394
+#: /ayatanawebmail/dialog.py:384
 msgid "Request a feature"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:396 ayatanawebmail/dialog.py:399
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
 #, python-brace-format
 msgid "It's a good idea to add the {labelname} label to your issue."
 msgstr ""
 
-#: ayatanawebmail/dialog.py:397
+#: /ayatanawebmail/dialog.py:387
 msgid "Ask a question"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:400
+#: /ayatanawebmail/dialog.py:390
 msgid "Help translate"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:402
+#: /ayatanawebmail/dialog.py:392
 msgid "Source code"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:404
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:424
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+msgid "Enable notifications"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+msgid "Play sound when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+msgid "Hide message count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:5
-msgid "Display notifications about new mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+msgid "Run this command when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+msgid "Custom sound"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:5
-msgid "Webmail notifications and actions for any desktop"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+msgid "Play a custom sound when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:15
-msgid "Mark all as read"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+msgid "Merge messages"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:20
-msgid "Compose Mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+msgid "Merge messages belonging to the same conversation."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:25
-msgid "Sent"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+msgid "Message action"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:30
-msgid "Inbox"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+msgid "Action to perform when a message is activated."
 msgstr ""
diff --git a/po/fy.po b/po/fy.po
index 70761d9..685ead1 100644
--- a/po/fy.po
+++ b/po/fy.po
@@ -6,9 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail 22.6.28\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/"
-"issues\n"
-"POT-Creation-Date: 2020-08-22 20:15+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -18,300 +17,329 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr ""
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr ""
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr ""
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:204
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr ""
 
-#: ayatanawebmail/application.py:211
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr ""
 
-#: ayatanawebmail/application.py:218
-#: data/usr/share/applications/ayatana-webmail.desktop:35
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr ""
 
-#: ayatanawebmail/application.py:957
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:1110
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr ""
 
-#: ayatanawebmail/application.py:1111
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
-msgid "Unable to connect to account \"{accountName}\", the application will now exit."
+msgid ""
+"Unable to connect to account \"{accountName}\", the application will now "
+"exit."
 msgstr ""
 
-#: ayatanawebmail/application.py:1136
+#: /ayatanawebmail/application.py:1131
 #, python-format
-msgid "You have %d unread mail"
-msgid_plural "You have %d unread mails"
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ayatanawebmail/application.py:1163
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr ""
 
-#: ayatanawebmail/application.py:1165
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1167
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1180
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:60
-msgid "If this string starts with http:// or https://, the application will open it in your browser - otherwise, it will be run as a command"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:61
+msgid ""
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:90 ayatanawebmail/dialog.py:104
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:132
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:140
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:141
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:142
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:143
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:204
-msgid "Please visit the following link and enable access for less secure apps:"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:206
-msgid "Access blocked by Google"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:210
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:211
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:234
-msgid "Custom"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:242
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:244
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:286
-msgid "The application will append this string to \"Inbox\" to access a specific message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+#: /ayatanawebmail/dialog.py:276
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:288
+#: /ayatanawebmail/dialog.py:278
 msgid "Account:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:290
+#: /ayatanawebmail/dialog.py:280
 msgid "Server:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:292
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:294
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:296
+#: /ayatanawebmail/dialog.py:286
 msgid "Username:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:298
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:300
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:302
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:296
 msgid "Sent:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:308
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:310
+#: /ayatanawebmail/dialog.py:300
 msgid "Message:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:346
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:347
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:348
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:358
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:360
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:362
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:364
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:369
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:376
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:392
+#: /ayatanawebmail/dialog.py:382
 msgid "Report a bug"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:394
+#: /ayatanawebmail/dialog.py:384
 msgid "Request a feature"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:396 ayatanawebmail/dialog.py:399
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
 #, python-brace-format
 msgid "It's a good idea to add the {labelname} label to your issue."
 msgstr ""
 
-#: ayatanawebmail/dialog.py:397
+#: /ayatanawebmail/dialog.py:387
 msgid "Ask a question"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:400
+#: /ayatanawebmail/dialog.py:390
 msgid "Help translate"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:402
+#: /ayatanawebmail/dialog.py:392
 msgid "Source code"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:404
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:424
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+msgid "Enable notifications"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+msgid "Play sound when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+msgid "Hide message count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:5
-msgid "Display notifications about new mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+msgid "Run this command when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+msgid "Custom sound"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:5
-msgid "Webmail notifications and actions for any desktop"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+msgid "Play a custom sound when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:15
-msgid "Mark all as read"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+msgid "Merge messages"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:20
-msgid "Compose Mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+msgid "Merge messages belonging to the same conversation."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:25
-msgid "Sent"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+msgid "Message action"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:30
-msgid "Inbox"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+msgid "Action to perform when a message is activated."
 msgstr ""
diff --git a/po/ga.po b/po/ga.po
index 1ff61e5..15563e2 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -6,9 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail 22.6.28\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/"
-"issues\n"
-"POT-Creation-Date: 2020-08-22 20:15+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -16,306 +15,335 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=5; plural=n==1 ? 0 : n==2 ? 1 : (n>2 && n<7) ? 2 :("
-"n>6 && n<11) ? 3 : 4;\n"
+"Plural-Forms: nplurals=5; plural=n==1 ? 0 : n==2 ? 1 : (n>2 && n<7) ? 2 :"
+"(n>6 && n<11) ? 3 : 4;\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr ""
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr ""
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr ""
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:204
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr ""
 
-#: ayatanawebmail/application.py:211
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr ""
 
-#: ayatanawebmail/application.py:218
-#: data/usr/share/applications/ayatana-webmail.desktop:35
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr ""
 
-#: ayatanawebmail/application.py:957
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:1110
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr ""
 
-#: ayatanawebmail/application.py:1111
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
-msgid "Unable to connect to account \"{accountName}\", the application will now exit."
+msgid ""
+"Unable to connect to account \"{accountName}\", the application will now "
+"exit."
 msgstr ""
 
-#: ayatanawebmail/application.py:1136
+#: /ayatanawebmail/application.py:1131
 #, python-format
-msgid "You have %d unread mail"
-msgid_plural "You have %d unread mails"
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 msgstr[4] ""
 
-#: ayatanawebmail/application.py:1163
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr ""
 
-#: ayatanawebmail/application.py:1165
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1167
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1180
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:60
-msgid "If this string starts with http:// or https://, the application will open it in your browser - otherwise, it will be run as a command"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:61
+msgid ""
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:90 ayatanawebmail/dialog.py:104
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:132
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:140
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:141
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:142
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:143
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:204
-msgid "Please visit the following link and enable access for less secure apps:"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:206
-msgid "Access blocked by Google"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:210
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:211
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:234
-msgid "Custom"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:242
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:244
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:286
-msgid "The application will append this string to \"Inbox\" to access a specific message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+#: /ayatanawebmail/dialog.py:276
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:288
+#: /ayatanawebmail/dialog.py:278
 msgid "Account:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:290
+#: /ayatanawebmail/dialog.py:280
 msgid "Server:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:292
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:294
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:296
+#: /ayatanawebmail/dialog.py:286
 msgid "Username:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:298
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:300
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:302
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:296
 msgid "Sent:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:308
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:310
+#: /ayatanawebmail/dialog.py:300
 msgid "Message:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:346
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:347
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:348
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:358
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:360
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:362
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:364
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:369
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:376
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:392
+#: /ayatanawebmail/dialog.py:382
 msgid "Report a bug"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:394
+#: /ayatanawebmail/dialog.py:384
 msgid "Request a feature"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:396 ayatanawebmail/dialog.py:399
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
 #, python-brace-format
 msgid "It's a good idea to add the {labelname} label to your issue."
 msgstr ""
 
-#: ayatanawebmail/dialog.py:397
+#: /ayatanawebmail/dialog.py:387
 msgid "Ask a question"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:400
+#: /ayatanawebmail/dialog.py:390
 msgid "Help translate"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:402
+#: /ayatanawebmail/dialog.py:392
 msgid "Source code"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:404
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:424
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+msgid "Enable notifications"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+msgid "Play sound when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+msgid "Hide message count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:5
-msgid "Display notifications about new mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+msgid "Run this command when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+msgid "Custom sound"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:5
-msgid "Webmail notifications and actions for any desktop"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+msgid "Play a custom sound when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:15
-msgid "Mark all as read"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+msgid "Merge messages"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:20
-msgid "Compose Mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+msgid "Merge messages belonging to the same conversation."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:25
-msgid "Sent"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+msgid "Message action"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:30
-msgid "Inbox"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+msgid "Action to perform when a message is activated."
 msgstr ""
diff --git a/po/gd.po b/po/gd.po
index ddecf0d..a8f9829 100644
--- a/po/gd.po
+++ b/po/gd.po
@@ -6,9 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail 22.6.28\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/"
-"issues\n"
-"POT-Creation-Date: 2020-08-22 20:15+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -19,308 +18,331 @@ msgstr ""
 "Plural-Forms: nplurals=4; plural=(n==1 || n==11) ? 0 : (n==2 || n==12) ? 1 : "
 "(n > 2 && n < 20) ? 2 : 3;\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr ""
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr ""
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr ""
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:204
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr ""
 
-#: ayatanawebmail/application.py:211
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr ""
 
-#: ayatanawebmail/application.py:218
-#: data/usr/share/applications/ayatana-webmail.desktop:35
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr ""
 
-#: ayatanawebmail/application.py:957
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:1110
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr ""
 
-#: ayatanawebmail/application.py:1111
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
 msgid ""
 "Unable to connect to account \"{accountName}\", the application will now "
 "exit."
 msgstr ""
 
-#: ayatanawebmail/application.py:1136
+#: /ayatanawebmail/application.py:1131
 #, python-format
-msgid "You have %d unread mail"
-msgid_plural "You have %d unread mails"
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: ayatanawebmail/application.py:1163
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr ""
 
-#: ayatanawebmail/application.py:1165
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1167
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1180
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:60
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:61
 msgid ""
 "If this string starts with http:// or https://, the application will open it "
 "in your browser - otherwise, it will be run as a command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:90 ayatanawebmail/dialog.py:104
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:132
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:140
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:141
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:142
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:143
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:204
-msgid "Please visit the following link and enable access for less secure apps:"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:206
-msgid "Access blocked by Google"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:210
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:211
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:234
-msgid "Custom"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:242
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr "Cuir ris"
 
-#: ayatanawebmail/dialog.py:244
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr "Thoir air falbh"
 
-#: ayatanawebmail/dialog.py:286
+#: /ayatanawebmail/dialog.py:276
 msgid ""
 "The application will append this string to \"Inbox\" to access a specific "
 "message - you can use the $MSG_THREAD and $MSG_UID placeholders"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:288
+#: /ayatanawebmail/dialog.py:278
 msgid "Account:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:290
+#: /ayatanawebmail/dialog.py:280
 msgid "Server:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:292
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:294
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:296
+#: /ayatanawebmail/dialog.py:286
 msgid "Username:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:298
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:300
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:302
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:296
 msgid "Sent:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:308
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:310
+#: /ayatanawebmail/dialog.py:300
 msgid "Message:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:346
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:347
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:348
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:358
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:360
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:362
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:364
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:369
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:376
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:392
+#: /ayatanawebmail/dialog.py:382
 msgid "Report a bug"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:394
+#: /ayatanawebmail/dialog.py:384
 msgid "Request a feature"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:396 ayatanawebmail/dialog.py:399
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
 #, python-brace-format
 msgid "It's a good idea to add the {labelname} label to your issue."
 msgstr ""
 
-#: ayatanawebmail/dialog.py:397
+#: /ayatanawebmail/dialog.py:387
 msgid "Ask a question"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:400
+#: /ayatanawebmail/dialog.py:390
 msgid "Help translate"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:402
+#: /ayatanawebmail/dialog.py:392
 msgid "Source code"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:404
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:424
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+msgid "Enable notifications"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+msgid "Play sound when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+msgid "Hide message count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:5
-msgid "Display notifications about new mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+msgid "Run this command when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+msgid "Custom sound"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:5
-msgid "Webmail notifications and actions for any desktop"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+msgid "Play a custom sound when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:15
-msgid "Mark all as read"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+msgid "Merge messages"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:20
-msgid "Compose Mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+msgid "Merge messages belonging to the same conversation."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:25
-msgid "Sent"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+msgid "Message action"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:30
-msgid "Inbox"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+msgid "Action to perform when a message is activated."
 msgstr ""
diff --git a/po/gl.po b/po/gl.po
index f097dcb..e8c9fa1 100755
--- a/po/gl.po
+++ b/po/gl.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/issues\n"
-"POT-Creation-Date: 2020-04-03 12:21+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: 2018-06-04 07:33+0000\n"
 "Language-Team: Galician <gl@li.org>\n"
+"Language: gl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -17,312 +18,360 @@ msgstr ""
 "X-Launchpad-Export-Date: 2020-04-04 05:58+0000\n"
 "X-Generator: Launchpad (build a296f04231dee355be5db73cc878b9e21689a253)\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr ""
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr ""
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr ""
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:205
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr ""
 
-#: ayatanawebmail/application.py:212
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr ""
 
-#: ayatanawebmail/application.py:219
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr ""
 
-#: ayatanawebmail/application.py:980
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr "Sen asunto"
 
-#: ayatanawebmail/application.py:1132
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr ""
 
-#: ayatanawebmail/application.py:1133
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
 msgid ""
 "Unable to connect to account \"{accountName}\", the application will now "
 "exit."
 msgstr ""
 
-#: ayatanawebmail/application.py:1133
-#, python-brace-format
-msgid "You can run \"{command}\" to delete all your login settings."
-msgstr ""
-
-#: ayatanawebmail/application.py:1158
-#, python-format
-msgid "You have %d unread mail"
-msgid_plural "You have %d unread mails"
+#: /ayatanawebmail/application.py:1131
+#, fuzzy, python-format
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
 msgstr[0] "Ten %d mensaxe sen ler"
 msgstr[1] "Ten %d mensaxes sen ler"
 
-#: ayatanawebmail/application.py:1185
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr "de %(t0)s, %(t1)s e outros"
 
-#: ayatanawebmail/application.py:1187
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr "de %(t0)s e %(t1)s"
 
-#: ayatanawebmail/application.py:1189
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr "de %s"
 
-#: ayatanawebmail/application.py:1202
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr "Novo correo de %s"
 
-#: ayatanawebmail/dialog.py:60
-msgid "Web page"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:61
-msgid "Command"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:93
+#: /ayatanawebmail/dialog.py:61
 msgid ""
-"Append an additional string - you can use the $MSG_THREAD and $MSG_UID "
-"placeholders."
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:114 ayatanawebmail/dialog.py:128
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:156
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr "Preferencias de Ayatana Webmail"
 
-#: ayatanawebmail/dialog.py:164
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr "Contas"
 
-#: ayatanawebmail/dialog.py:165
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr "Opcións"
 
-#: ayatanawebmail/dialog.py:166
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:167
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:228
-msgid ""
-"Please visit the following link and enable access for less secure apps:"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:230
-msgid "Access blocked by Google"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:234
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:235
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:254
-msgid "Choose an account"
-msgstr "Escolla unha conta"
-
-#: ayatanawebmail/dialog.py:259
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:261
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:276
-msgid "Server data"
-msgstr "Datos do servidor"
+#: /ayatanawebmail/dialog.py:276
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+msgstr ""
 
-#: ayatanawebmail/dialog.py:278
-msgid "Account data"
-msgstr "Datos da conta"
+#: /ayatanawebmail/dialog.py:278
+#, fuzzy
+msgid "Account:"
+msgstr "Contas"
 
-#: ayatanawebmail/dialog.py:289
-msgid "Links"
-msgstr ""
+#: /ayatanawebmail/dialog.py:280
+#, fuzzy
+msgid "Server:"
+msgstr "Datos do servidor"
 
-#: ayatanawebmail/dialog.py:297
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr "Servidor:"
 
-#: ayatanawebmail/dialog.py:299
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr "Porto:"
 
-#: ayatanawebmail/dialog.py:302
-msgid "Login:"
-msgstr "Usuario:"
+#: /ayatanawebmail/dialog.py:286
+msgid "Username:"
+msgstr ""
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr "Contrasinal:"
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:309
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr "Inicio:"
 
-#: ayatanawebmail/dialog.py:311
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr "Redactar:"
 
-#: ayatanawebmail/dialog.py:313
+#: /ayatanawebmail/dialog.py:296
+msgid "Sent:"
+msgstr "Enviados:"
+
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr "Caixa de entrada:"
 
-#: ayatanawebmail/dialog.py:316
-msgid "Sent:"
-msgstr "Enviados:"
+#: /ayatanawebmail/dialog.py:300
+msgid "Message:"
+msgstr ""
 
-#: ayatanawebmail/dialog.py:354
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:355
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:356
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr "Activar notificacións:"
 
-#: ayatanawebmail/dialog.py:368
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:370
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:372
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:374
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:377
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:384
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr "Son personalizado:"
 
-#: ayatanawebmail/dialog.py:400
-msgid "Report a bug/Request a feature"
+#: /ayatanawebmail/dialog.py:382
+msgid "Report a bug"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:402
-msgid "Ask a question"
+#: /ayatanawebmail/dialog.py:384
+msgid "Request a feature"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:404
-msgid "Help translate"
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
+#, python-brace-format
+msgid "It's a good idea to add the {labelname} label to your issue."
 msgstr ""
 
-#: ayatanawebmail/dialog.py:406
-msgid "Project page"
+#: /ayatanawebmail/dialog.py:387
+msgid "Ask a question"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:408
-msgid "Source code"
+#: /ayatanawebmail/dialog.py:390
+msgid "Help translate"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:410
-msgid "Repository"
+#: /ayatanawebmail/dialog.py:392
+msgid "Source code"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:412
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:426
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
-msgstr "Correo de Ayatana"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+#, fuzzy
+msgid "Enable notifications"
+msgstr "Activar notificacións:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+msgid "Play sound when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+msgid "Hide message count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:39
-msgid "Webmail notifications and actions for any desktop"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:74
-msgid "Mark all as read"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+msgid "Run this command when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:112
-msgid "Compose Mail"
-msgstr "Crear unha nova mensaxe de correo-e"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+#, fuzzy
+msgid "Custom sound"
+msgstr "Son personalizado:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+msgid "Play a custom sound when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+msgid "Merge messages"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+msgid "Merge messages belonging to the same conversation."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+msgid "Message action"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+msgid "Action to perform when a message is activated."
+msgstr ""
+
+#~ msgid "Choose an account"
+#~ msgstr "Escolla unha conta"
+
+#~ msgid "Account data"
+#~ msgstr "Datos da conta"
+
+#~ msgid "Login:"
+#~ msgstr "Usuario:"
+
+#~ msgid "Ayatana Webmail"
+#~ msgstr "Correo de Ayatana"
+
+#~ msgid "Compose Mail"
+#~ msgstr "Crear unha nova mensaxe de correo-e"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:152
-msgid "Sent"
-msgstr "Enviado"
+#~ msgid "Sent"
+#~ msgstr "Enviado"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:228
-msgid "Inbox"
-msgstr "Caixa de entrada"
+#~ msgid "Inbox"
+#~ msgstr "Caixa de entrada"
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
-msgstr "Ayatana Webmail (servizo)"
+#~ msgid "Ayatana Webmail (service)"
+#~ msgstr "Ayatana Webmail (servizo)"
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:38
-msgid "Display notifications about new mail"
-msgstr "Mostra notificacións de novas mensaxes de correo-e"
+#~ msgid "Display notifications about new mail"
+#~ msgstr "Mostra notificacións de novas mensaxes de correo-e"
diff --git a/po/gu.po b/po/gu.po
index d63c9f0..48c219c 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -6,9 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail 22.6.28\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/"
-"issues\n"
-"POT-Creation-Date: 2020-08-22 20:15+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -18,300 +17,329 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr ""
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr ""
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr ""
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:204
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr ""
 
-#: ayatanawebmail/application.py:211
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr ""
 
-#: ayatanawebmail/application.py:218
-#: data/usr/share/applications/ayatana-webmail.desktop:35
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr ""
 
-#: ayatanawebmail/application.py:957
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:1110
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr ""
 
-#: ayatanawebmail/application.py:1111
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
-msgid "Unable to connect to account \"{accountName}\", the application will now exit."
+msgid ""
+"Unable to connect to account \"{accountName}\", the application will now "
+"exit."
 msgstr ""
 
-#: ayatanawebmail/application.py:1136
+#: /ayatanawebmail/application.py:1131
 #, python-format
-msgid "You have %d unread mail"
-msgid_plural "You have %d unread mails"
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ayatanawebmail/application.py:1163
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr ""
 
-#: ayatanawebmail/application.py:1165
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1167
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1180
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:60
-msgid "If this string starts with http:// or https://, the application will open it in your browser - otherwise, it will be run as a command"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:61
+msgid ""
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:90 ayatanawebmail/dialog.py:104
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:132
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:140
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:141
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:142
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:143
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:204
-msgid "Please visit the following link and enable access for less secure apps:"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:206
-msgid "Access blocked by Google"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:210
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:211
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:234
-msgid "Custom"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:242
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:244
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:286
-msgid "The application will append this string to \"Inbox\" to access a specific message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+#: /ayatanawebmail/dialog.py:276
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:288
+#: /ayatanawebmail/dialog.py:278
 msgid "Account:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:290
+#: /ayatanawebmail/dialog.py:280
 msgid "Server:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:292
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:294
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:296
+#: /ayatanawebmail/dialog.py:286
 msgid "Username:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:298
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:300
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:302
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:296
 msgid "Sent:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:308
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:310
+#: /ayatanawebmail/dialog.py:300
 msgid "Message:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:346
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:347
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:348
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:358
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:360
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:362
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:364
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:369
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:376
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:392
+#: /ayatanawebmail/dialog.py:382
 msgid "Report a bug"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:394
+#: /ayatanawebmail/dialog.py:384
 msgid "Request a feature"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:396 ayatanawebmail/dialog.py:399
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
 #, python-brace-format
 msgid "It's a good idea to add the {labelname} label to your issue."
 msgstr ""
 
-#: ayatanawebmail/dialog.py:397
+#: /ayatanawebmail/dialog.py:387
 msgid "Ask a question"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:400
+#: /ayatanawebmail/dialog.py:390
 msgid "Help translate"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:402
+#: /ayatanawebmail/dialog.py:392
 msgid "Source code"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:404
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:424
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+msgid "Enable notifications"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+msgid "Play sound when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+msgid "Hide message count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:5
-msgid "Display notifications about new mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+msgid "Run this command when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+msgid "Custom sound"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:5
-msgid "Webmail notifications and actions for any desktop"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+msgid "Play a custom sound when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:15
-msgid "Mark all as read"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+msgid "Merge messages"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:20
-msgid "Compose Mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+msgid "Merge messages belonging to the same conversation."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:25
-msgid "Sent"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+msgid "Message action"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:30
-msgid "Inbox"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+msgid "Action to perform when a message is activated."
 msgstr ""
diff --git a/po/gv.po b/po/gv.po
index 383ef44..1bcb97c 100644
--- a/po/gv.po
+++ b/po/gv.po
@@ -6,9 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail 22.6.28\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/"
-"issues\n"
-"POT-Creation-Date: 2020-08-22 20:15+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -16,306 +15,335 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=(n % 10 == 1) ? 0 : ((n % 10 == 2) ? 1 : (("
-"n % 100 == 0 || n % 100 == 20 || n % 100 == 40 || n % 100 == 60 || n % 100 "
+"Plural-Forms: nplurals=4; plural=(n % 10 == 1) ? 0 : ((n % 10 == 2) ? 1 : "
+"((n % 100 == 0 || n % 100 == 20 || n % 100 == 40 || n % 100 == 60 || n % 100 "
 "== 80) ? 2 : 3));\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr ""
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr ""
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr ""
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:204
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr ""
 
-#: ayatanawebmail/application.py:211
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr ""
 
-#: ayatanawebmail/application.py:218
-#: data/usr/share/applications/ayatana-webmail.desktop:35
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr ""
 
-#: ayatanawebmail/application.py:957
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:1110
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr ""
 
-#: ayatanawebmail/application.py:1111
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
-msgid "Unable to connect to account \"{accountName}\", the application will now exit."
+msgid ""
+"Unable to connect to account \"{accountName}\", the application will now "
+"exit."
 msgstr ""
 
-#: ayatanawebmail/application.py:1136
+#: /ayatanawebmail/application.py:1131
 #, python-format
-msgid "You have %d unread mail"
-msgid_plural "You have %d unread mails"
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: ayatanawebmail/application.py:1163
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr ""
 
-#: ayatanawebmail/application.py:1165
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1167
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1180
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:60
-msgid "If this string starts with http:// or https://, the application will open it in your browser - otherwise, it will be run as a command"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:61
+msgid ""
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:90 ayatanawebmail/dialog.py:104
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:132
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:140
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:141
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:142
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:143
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:204
-msgid "Please visit the following link and enable access for less secure apps:"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:206
-msgid "Access blocked by Google"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:210
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:211
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:234
-msgid "Custom"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:242
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:244
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:286
-msgid "The application will append this string to \"Inbox\" to access a specific message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+#: /ayatanawebmail/dialog.py:276
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:288
+#: /ayatanawebmail/dialog.py:278
 msgid "Account:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:290
+#: /ayatanawebmail/dialog.py:280
 msgid "Server:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:292
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:294
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:296
+#: /ayatanawebmail/dialog.py:286
 msgid "Username:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:298
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:300
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:302
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:296
 msgid "Sent:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:308
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:310
+#: /ayatanawebmail/dialog.py:300
 msgid "Message:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:346
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:347
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:348
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:358
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:360
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:362
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:364
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:369
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:376
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:392
+#: /ayatanawebmail/dialog.py:382
 msgid "Report a bug"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:394
+#: /ayatanawebmail/dialog.py:384
 msgid "Request a feature"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:396 ayatanawebmail/dialog.py:399
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
 #, python-brace-format
 msgid "It's a good idea to add the {labelname} label to your issue."
 msgstr ""
 
-#: ayatanawebmail/dialog.py:397
+#: /ayatanawebmail/dialog.py:387
 msgid "Ask a question"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:400
+#: /ayatanawebmail/dialog.py:390
 msgid "Help translate"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:402
+#: /ayatanawebmail/dialog.py:392
 msgid "Source code"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:404
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:424
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+msgid "Enable notifications"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+msgid "Play sound when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+msgid "Hide message count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:5
-msgid "Display notifications about new mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+msgid "Run this command when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+msgid "Custom sound"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:5
-msgid "Webmail notifications and actions for any desktop"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+msgid "Play a custom sound when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:15
-msgid "Mark all as read"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+msgid "Merge messages"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:20
-msgid "Compose Mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+msgid "Merge messages belonging to the same conversation."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:25
-msgid "Sent"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+msgid "Message action"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:30
-msgid "Inbox"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+msgid "Action to perform when a message is activated."
 msgstr ""
diff --git a/po/he.po b/po/he.po
index f5929f7..33eb0fa 100644
--- a/po/he.po
+++ b/po/he.po
@@ -6,13 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail 22.6.28\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/"
-"issues\n"
-"POT-Creation-Date: 2020-08-22 20:15+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: 2022-03-01 07:58+0000\n"
 "Last-Translator: Yaron Shahrabani <sh.yaron@gmail.com>\n"
-"Language-Team: Hebrew <https://hosted.weblate.org/projects/"
-"ayatana-indicators/ayatana-webmail/he/>\n"
+"Language-Team: Hebrew <https://hosted.weblate.org/projects/ayatana-"
+"indicators/ayatana-webmail/he/>\n"
 "Language: he\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,306 +20,376 @@ msgstr ""
 "n % 10 == 0) ? 2 : 3));\n"
 "X-Generator: Weblate 4.11.1-dev\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr "נא לבחור חשבון"
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr "איזו פקודה/אתר של חשבון לפתוח?"
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr "פעולות על הודעות"
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr "מחיקה"
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr "סימון כנקראה"
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr "לפתוח הודעה/להריץ פקודה"
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr "מוען"
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr "נושא"
 
-#: ayatanawebmail/application.py:204
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr "לפתוח את עמוד הבית של אתר הדוא״ל"
 
-#: ayatanawebmail/application.py:211
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr "מחיקה"
 
-#: ayatanawebmail/application.py:218
-#: data/usr/share/applications/ayatana-webmail.desktop:35
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr "הגדרות"
 
-#: ayatanawebmail/application.py:957
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr "אין נושא"
 
-#: ayatanawebmail/application.py:1110
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr "שגיאת חיבור"
 
-#: ayatanawebmail/application.py:1111
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
-msgid "Unable to connect to account \"{accountName}\", the application will now exit."
+msgid ""
+"Unable to connect to account \"{accountName}\", the application will now "
+"exit."
 msgstr "לא ניתן להתחבר לחשבון „{accountName}”, היישום יצא כעת."
 
-#: ayatanawebmail/application.py:1136
-#, python-format
-msgid "You have %d unread mail"
-msgid_plural "You have %d unread mails"
+#: /ayatanawebmail/application.py:1131
+#, fuzzy, python-format
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
 msgstr[0] "יש לך הודעה שלא נקראה"
 msgstr[1] "יש לך %d הודעות שלא נקראו"
 msgstr[2] "יש לך %d הודעות שלא נקראו"
 msgstr[3] "יש לך %d הודעות שלא נקראו"
 
-#: ayatanawebmail/application.py:1163
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr "מאת %(t0)s, %(t1)s ונוספים"
 
-#: ayatanawebmail/application.py:1165
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr "מאת %(t0)s ו־%(t1)s"
 
-#: ayatanawebmail/application.py:1167
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr "מאת %s"
 
-#: ayatanawebmail/application.py:1180
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr "הודעה חדשה מאת %s"
 
-#: ayatanawebmail/dialog.py:60
-msgid "If this string starts with http:// or https://, the application will open it in your browser - otherwise, it will be run as a command"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
+msgstr "התאמה אישית"
+
+#: /ayatanawebmail/dialog.py:61
+msgid ""
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
-"אם המחרוזת הזאת מתחילה ב־http://‎ או ב־https://‎, היישום יפתח אותה בדפדפן "
-"שלך - אחרת, היא תופעל כפקודה"
+"אם המחרוזת הזאת מתחילה ב־http://‎ או ב־https://‎, היישום יפתח אותה בדפדפן שלך "
+"- אחרת, היא תופעל כפקודה"
 
-#: ayatanawebmail/dialog.py:90 ayatanawebmail/dialog.py:104
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr "(ללא)"
 
-#: ayatanawebmail/dialog.py:132
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr "העדפות הדוא״ל של Ayatana"
 
-#: ayatanawebmail/dialog.py:140
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr "חשבונות"
 
-#: ayatanawebmail/dialog.py:141
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr "אפשרויות"
 
-#: ayatanawebmail/dialog.py:142
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr "תמיכה"
 
-#: ayatanawebmail/dialog.py:143
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr "על אודות"
 
-#: ayatanawebmail/dialog.py:204
-msgid "Please visit the following link and enable access for less secure apps:"
-msgstr "נא לבקר בקישור הבא ולהפעיל גישה ליישומים פחות מאובטחים:"
-
-#: ayatanawebmail/dialog.py:206
-msgid "Access blocked by Google"
-msgstr "הגישה נחסמה על ידי Google"
-
-#: ayatanawebmail/dialog.py:210
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr "ההתחברות לחשבון הדוא״ל נכשלה. השגיאה שהוחזרה היא:"
 
-#: ayatanawebmail/dialog.py:211
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr "שגיאת התחברות"
 
-#: ayatanawebmail/dialog.py:234
-msgid "Custom"
-msgstr "התאמה אישית"
-
-#: ayatanawebmail/dialog.py:242
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr "הוספה"
 
-#: ayatanawebmail/dialog.py:244
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr "הסרה"
 
-#: ayatanawebmail/dialog.py:286
-msgid "The application will append this string to \"Inbox\" to access a specific message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+#: /ayatanawebmail/dialog.py:276
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
 msgstr ""
 "היישום יוסיף את המחרוזת „דואר נכנס” כדי לגשת להודעה מסוימת - אפשר להשתמש "
 "בממלאי המקום ‎$MSG_THREAD ו־‎$MSG_UID"
 
-#: ayatanawebmail/dialog.py:288
+#: /ayatanawebmail/dialog.py:278
 msgid "Account:"
 msgstr "חשבון:"
 
-#: ayatanawebmail/dialog.py:290
+#: /ayatanawebmail/dialog.py:280
 msgid "Server:"
 msgstr "שרת:"
 
-#: ayatanawebmail/dialog.py:292
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr "מארח:"
 
-#: ayatanawebmail/dialog.py:294
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr "פתחה:"
 
-#: ayatanawebmail/dialog.py:296
+#: /ayatanawebmail/dialog.py:286
 msgid "Username:"
 msgstr "שם משתמש:"
 
-#: ayatanawebmail/dialog.py:298
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr "סיסמה:"
 
-#: ayatanawebmail/dialog.py:300
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr "תיקיות:"
 
-#: ayatanawebmail/dialog.py:302
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr "בית:"
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr "כתיבה:"
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:296
 msgid "Sent:"
 msgstr "שליחה:"
 
-#: ayatanawebmail/dialog.py:308
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr "דואר נכנס:"
 
-#: ayatanawebmail/dialog.py:310
+#: /ayatanawebmail/dialog.py:300
 msgid "Message:"
 msgstr "הודעה:"
 
-#: ayatanawebmail/dialog.py:346
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr "סימון ההודעה כנקראה"
 
-#: ayatanawebmail/dialog.py:347
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr "פתיחת הודעה בדפדפן/הפעלת פקודה"
 
-#: ayatanawebmail/dialog.py:348
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr "לשאול אותי מה לעשות"
 
-#: ayatanawebmail/dialog.py:358
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr "הפעלת התראות:"
 
-#: ayatanawebmail/dialog.py:360
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr "לנגן צליל כאשר מתקבלת הודעה:"
 
-#: ayatanawebmail/dialog.py:362
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr "מיזוג הודעות מאותו הדיון:"
 
-#: ayatanawebmail/dialog.py:364
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr "הסתרת המונה כאשר אפס:"
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr "כאשר הודעה מופעלת:"
 
-#: ayatanawebmail/dialog.py:369
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr "להריץ פקודה כשמתקבלת הודעה:"
 
-#: ayatanawebmail/dialog.py:376
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr "צליל משלך להשמעה:"
 
-#: ayatanawebmail/dialog.py:392
+#: /ayatanawebmail/dialog.py:382
 msgid "Report a bug"
 msgstr "דיווח על תקלה"
 
-#: ayatanawebmail/dialog.py:394
+#: /ayatanawebmail/dialog.py:384
 msgid "Request a feature"
 msgstr "בקשת יכולת"
 
-#: ayatanawebmail/dialog.py:396 ayatanawebmail/dialog.py:399
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
 #, python-brace-format
 msgid "It's a good idea to add the {labelname} label to your issue."
 msgstr "יכול להיות רעיון מוצלח להוסיף את התווית {labelname} לדיווח שלך."
 
-#: ayatanawebmail/dialog.py:397
+#: /ayatanawebmail/dialog.py:387
 msgid "Ask a question"
 msgstr "לשאול שאלה"
 
-#: ayatanawebmail/dialog.py:400
+#: /ayatanawebmail/dialog.py:390
 msgid "Help translate"
 msgstr "עזרה בתרגום"
 
-#: ayatanawebmail/dialog.py:402
+#: /ayatanawebmail/dialog.py:392
 msgid "Source code"
 msgstr "קוד מקור"
 
-#: ayatanawebmail/dialog.py:404
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr "דף הבית"
 
-#: ayatanawebmail/dialog.py:424
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr "ירון שהרבני <sh.yaron@gmail.com>"
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
-msgstr "דוא״ל של Ayatana (שירות)"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+#, fuzzy
+msgid "Enable notifications"
+msgstr "הפעלת התראות:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+#, fuzzy
+msgid "Play sound when new messages arrive."
+msgstr "לנגן צליל כאשר מתקבלת הודעה:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+#, fuzzy
+msgid "Hide message count"
+msgstr "לפתוח הודעה/להריץ פקודה"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+#, fuzzy
+msgid "Run this command when new messages arrive."
+msgstr "להריץ פקודה כשמתקבלת הודעה:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+#, fuzzy
+msgid "Custom sound"
+msgstr "צליל משלך להשמעה:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+#, fuzzy
+msgid "Play a custom sound when new messages arrive."
+msgstr "לנגן צליל כאשר מתקבלת הודעה:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+#, fuzzy
+msgid "Merge messages"
+msgstr "סימון ההודעה כנקראה"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+#, fuzzy
+msgid "Merge messages belonging to the same conversation."
+msgstr "מיזוג הודעות מאותו הדיון:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+#, fuzzy
+msgid "Message action"
+msgstr "פעולות על הודעות"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+#, fuzzy
+msgid "Action to perform when a message is activated."
+msgstr "כאשר הודעה מופעלת:"
+
+#~ msgid ""
+#~ "Please visit the following link and enable access for less secure apps:"
+#~ msgstr "נא לבקר בקישור הבא ולהפעיל גישה ליישומים פחות מאובטחים:"
+
+#~ msgid "Access blocked by Google"
+#~ msgstr "הגישה נחסמה על ידי Google"
+
+#~ msgid "Ayatana Webmail (service)"
+#~ msgstr "דוא״ל של Ayatana (שירות)"
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:5
-msgid "Display notifications about new mail"
-msgstr "הצגת התראות על הודעות חדשות"
+#~ msgid "Display notifications about new mail"
+#~ msgstr "הצגת התראות על הודעות חדשות"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
-msgstr "דוא״ל של Ayatana"
+#~ msgid "Ayatana Webmail"
+#~ msgstr "דוא״ל של Ayatana"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:5
-msgid "Webmail notifications and actions for any desktop"
-msgstr "התראות דוא״ל ופעולות לכל שולחן עבודה"
+#~ msgid "Webmail notifications and actions for any desktop"
+#~ msgstr "התראות דוא״ל ופעולות לכל שולחן עבודה"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:15
-msgid "Mark all as read"
-msgstr "סימון הכול כנקרא"
+#~ msgid "Mark all as read"
+#~ msgstr "סימון הכול כנקרא"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:20
-msgid "Compose Mail"
-msgstr "כתיבת הודעה"
+#~ msgid "Compose Mail"
+#~ msgstr "כתיבת הודעה"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:25
-msgid "Sent"
-msgstr "נשלח"
+#~ msgid "Sent"
+#~ msgstr "נשלח"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:30
-msgid "Inbox"
-msgstr "דואר נכנס"
+#~ msgid "Inbox"
+#~ msgstr "דואר נכנס"
diff --git a/po/hi.po b/po/hi.po
index 8aa7908..ae9e8ef 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -6,9 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail 22.6.28\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/"
-"issues\n"
-"POT-Creation-Date: 2020-08-22 20:15+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -18,300 +17,329 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr ""
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr ""
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr ""
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:204
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr ""
 
-#: ayatanawebmail/application.py:211
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr ""
 
-#: ayatanawebmail/application.py:218
-#: data/usr/share/applications/ayatana-webmail.desktop:35
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr ""
 
-#: ayatanawebmail/application.py:957
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:1110
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr ""
 
-#: ayatanawebmail/application.py:1111
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
-msgid "Unable to connect to account \"{accountName}\", the application will now exit."
+msgid ""
+"Unable to connect to account \"{accountName}\", the application will now "
+"exit."
 msgstr ""
 
-#: ayatanawebmail/application.py:1136
+#: /ayatanawebmail/application.py:1131
 #, python-format
-msgid "You have %d unread mail"
-msgid_plural "You have %d unread mails"
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ayatanawebmail/application.py:1163
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr ""
 
-#: ayatanawebmail/application.py:1165
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1167
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1180
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:60
-msgid "If this string starts with http:// or https://, the application will open it in your browser - otherwise, it will be run as a command"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:61
+msgid ""
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:90 ayatanawebmail/dialog.py:104
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:132
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:140
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:141
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:142
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:143
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:204
-msgid "Please visit the following link and enable access for less secure apps:"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:206
-msgid "Access blocked by Google"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:210
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:211
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:234
-msgid "Custom"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:242
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:244
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:286
-msgid "The application will append this string to \"Inbox\" to access a specific message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+#: /ayatanawebmail/dialog.py:276
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:288
+#: /ayatanawebmail/dialog.py:278
 msgid "Account:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:290
+#: /ayatanawebmail/dialog.py:280
 msgid "Server:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:292
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:294
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:296
+#: /ayatanawebmail/dialog.py:286
 msgid "Username:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:298
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:300
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:302
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:296
 msgid "Sent:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:308
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:310
+#: /ayatanawebmail/dialog.py:300
 msgid "Message:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:346
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:347
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:348
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:358
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:360
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:362
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:364
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:369
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:376
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:392
+#: /ayatanawebmail/dialog.py:382
 msgid "Report a bug"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:394
+#: /ayatanawebmail/dialog.py:384
 msgid "Request a feature"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:396 ayatanawebmail/dialog.py:399
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
 #, python-brace-format
 msgid "It's a good idea to add the {labelname} label to your issue."
 msgstr ""
 
-#: ayatanawebmail/dialog.py:397
+#: /ayatanawebmail/dialog.py:387
 msgid "Ask a question"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:400
+#: /ayatanawebmail/dialog.py:390
 msgid "Help translate"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:402
+#: /ayatanawebmail/dialog.py:392
 msgid "Source code"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:404
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:424
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+msgid "Enable notifications"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+msgid "Play sound when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+msgid "Hide message count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:5
-msgid "Display notifications about new mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+msgid "Run this command when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+msgid "Custom sound"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:5
-msgid "Webmail notifications and actions for any desktop"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+msgid "Play a custom sound when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:15
-msgid "Mark all as read"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+msgid "Merge messages"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:20
-msgid "Compose Mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+msgid "Merge messages belonging to the same conversation."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:25
-msgid "Sent"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+msgid "Message action"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:30
-msgid "Inbox"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+msgid "Action to perform when a message is activated."
 msgstr ""
diff --git a/po/hr.po b/po/hr.po
index d6ee18c..aef88c5 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -6,13 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/"
-"issues\n"
-"POT-Creation-Date: 2020-04-03 12:21+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: 2020-09-09 01:36+0000\n"
 "Last-Translator: Milo Ivir <mail@milotype.de>\n"
-"Language-Team: Croatian <https://hosted.weblate.org/projects/"
-"ayatana-indicators/ayatana-webmail/hr/>\n"
+"Language-Team: Croatian <https://hosted.weblate.org/projects/ayatana-"
+"indicators/ayatana-webmail/hr/>\n"
 "Language: hr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,59 +21,59 @@ msgstr ""
 "X-Generator: Weblate 4.3-dev\n"
 "X-Launchpad-Export-Date: 2020-04-04 05:58+0000\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr "Odaberi račun"
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr "Koju naredbu računa/web-stranicu želiš otvoriti?"
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr "Radnje poruke"
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr "Izbriši"
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr "Označi kao pročitano"
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr "Otvori poruku/Pokreni naredbu"
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr "Pošiljatelj"
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr "Predmet"
 
-#: ayatanawebmail/application.py:205
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr "Otvori početnu stranicu webmaila"
 
-#: ayatanawebmail/application.py:212
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr "Izbriši"
 
-#: ayatanawebmail/application.py:219
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr "Postavke"
 
-#: ayatanawebmail/application.py:980
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr "Nema naslova"
 
-#: ayatanawebmail/application.py:1132
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr "Greška u vezi"
 
-#: ayatanawebmail/application.py:1133
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
 msgid ""
 "Unable to connect to account \"{accountName}\", the application will now "
@@ -83,257 +82,349 @@ msgstr ""
 "Nije moguće povezati se s računom „{accountName}”. Pprogram će se sada "
 "zatvoriti."
 
-#: ayatanawebmail/application.py:1133
-#, python-brace-format
-msgid "You can run \"{command}\" to delete all your login settings."
-msgstr "Za brisanje svih postavaka prijave možeš pokrenuti \"{command}\"."
-
-#: ayatanawebmail/application.py:1158
-#, python-format
-msgid "You have %d unread mail"
-msgid_plural "You have %d unread mails"
+#: /ayatanawebmail/application.py:1131
+#, fuzzy, python-format
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
 msgstr[0] "Imate %d nepročitanu poruku"
 msgstr[1] "Imate %d nepročitane poruke"
 msgstr[2] "Imate %d nepročitanih poruka"
 
-#: ayatanawebmail/application.py:1185
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr "od %(t0)s, %(t1)s i ostalih"
 
-#: ayatanawebmail/application.py:1187
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr "od %(t0)s i %(t1)s"
 
-#: ayatanawebmail/application.py:1189
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr "od %s"
 
-#: ayatanawebmail/application.py:1202
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr "Nova pošta od %s"
 
-#: ayatanawebmail/dialog.py:60
-msgid "Web page"
-msgstr "Web-stranica"
-
-#: ayatanawebmail/dialog.py:61
-msgid "Command"
-msgstr "Naredba"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
+msgstr ""
 
-#: ayatanawebmail/dialog.py:93
+#: /ayatanawebmail/dialog.py:61
 msgid ""
-"Append an additional string - you can use the $MSG_THREAD and $MSG_UID "
-"placeholders."
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
-"Dodaj dodatni znakovni niz – možeš koristiti rezervirana mjesta $ MSG_THREAD "
-"i $ MSG_UID."
 
-#: ayatanawebmail/dialog.py:114 ayatanawebmail/dialog.py:128
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr "(Ništa)"
 
-#: ayatanawebmail/dialog.py:156
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr "Ayatana Webmail osobitosti"
 
-#: ayatanawebmail/dialog.py:164
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr "Korisnički računi"
 
-#: ayatanawebmail/dialog.py:165
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr "Mogućnosti"
 
-#: ayatanawebmail/dialog.py:166
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr "Podrška"
 
-#: ayatanawebmail/dialog.py:167
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr "O programu"
 
-#: ayatanawebmail/dialog.py:228
-msgid ""
-"Please visit the following link and enable access for less secure apps:"
-msgstr ""
-"Posjeti sljedeću poveznicu i aktiviraj pristup za manje sigurne aplikacije:"
-
-#: ayatanawebmail/dialog.py:230
-msgid "Access blocked by Google"
-msgstr "Google je blokirao pristup"
-
-#: ayatanawebmail/dialog.py:234
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr "Neuspjelo povezivanje s e-mail računom. Prijavljena greška je:"
 
-#: ayatanawebmail/dialog.py:235
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr "Kvar veze"
 
-#: ayatanawebmail/dialog.py:254
-msgid "Choose an account"
-msgstr "Odaberite račun"
-
-#: ayatanawebmail/dialog.py:259
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr "Dodaj"
 
-#: ayatanawebmail/dialog.py:261
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr "Ukloni"
 
-#: ayatanawebmail/dialog.py:276
-msgid "Server data"
-msgstr "Podaci poslužitelja"
+#: /ayatanawebmail/dialog.py:276
+#, fuzzy
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+msgstr ""
+"Dodaj dodatni znakovni niz – možeš koristiti rezervirana mjesta $ MSG_THREAD "
+"i $ MSG_UID."
 
-#: ayatanawebmail/dialog.py:278
-msgid "Account data"
-msgstr "Podaci računa"
+#: /ayatanawebmail/dialog.py:278
+#, fuzzy
+msgid "Account:"
+msgstr "Korisnički računi"
 
-#: ayatanawebmail/dialog.py:289
-msgid "Links"
-msgstr "Poveznice"
+#: /ayatanawebmail/dialog.py:280
+#, fuzzy
+msgid "Server:"
+msgstr "Podaci poslužitelja"
 
-#: ayatanawebmail/dialog.py:297
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr "Poslužitelj:"
 
-#: ayatanawebmail/dialog.py:299
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr "Port:"
 
-#: ayatanawebmail/dialog.py:302
-msgid "Login:"
-msgstr "Prijava:"
+#: /ayatanawebmail/dialog.py:286
+msgid "Username:"
+msgstr ""
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr "Lozinka:"
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr "Mape:"
 
-#: ayatanawebmail/dialog.py:309
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr "Početna:"
 
-#: ayatanawebmail/dialog.py:311
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr "Nova poruka:"
 
-#: ayatanawebmail/dialog.py:313
+#: /ayatanawebmail/dialog.py:296
+msgid "Sent:"
+msgstr "Poslano:"
+
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr "Dolazno:"
 
-#: ayatanawebmail/dialog.py:316
-msgid "Sent:"
-msgstr "Poslano:"
+#: /ayatanawebmail/dialog.py:300
+#, fuzzy
+msgid "Message:"
+msgstr "Radnje poruke"
 
-#: ayatanawebmail/dialog.py:354
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr "Označi poruku kao pročitanu"
 
-#: ayatanawebmail/dialog.py:355
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr "Otvori poruku u pregledniku/Izvrši naredbu"
 
-#: ayatanawebmail/dialog.py:356
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr "Pitaj me što uraditi"
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr "Aktiviraj obavijesti:"
 
-#: ayatanawebmail/dialog.py:368
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr "Odsviraj zvuk, kad se primi poruka:"
 
-#: ayatanawebmail/dialog.py:370
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr "Sjedini poruke iz istog razgovora:"
 
-#: ayatanawebmail/dialog.py:372
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr "Sakrij broj kad je nula:"
 
-#: ayatanawebmail/dialog.py:374
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr "Kad je poruka aktivirana:"
 
-#: ayatanawebmail/dialog.py:377
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr "Izvrši ovu naredbu kad se primi poruka:"
 
-#: ayatanawebmail/dialog.py:384
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr "Poseban zvuk za reprodukciju:"
 
-#: ayatanawebmail/dialog.py:400
-msgid "Report a bug/Request a feature"
+#: /ayatanawebmail/dialog.py:382
+msgid "Report a bug"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:384
+#, fuzzy
+msgid "Request a feature"
 msgstr "Prijavi grešku/Zatraži funkciju"
 
-#: ayatanawebmail/dialog.py:402
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
+#, python-brace-format
+msgid "It's a good idea to add the {labelname} label to your issue."
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:387
 msgid "Ask a question"
 msgstr "Postavi pitanje"
 
-#: ayatanawebmail/dialog.py:404
+#: /ayatanawebmail/dialog.py:390
 msgid "Help translate"
 msgstr "Pomogni prevoditi"
 
-#: ayatanawebmail/dialog.py:406
-msgid "Project page"
-msgstr "Stranica projekta"
-
-#: ayatanawebmail/dialog.py:408
+#: /ayatanawebmail/dialog.py:392
 msgid "Source code"
 msgstr "Izvorni kȏd"
 
-#: ayatanawebmail/dialog.py:410
-msgid "Repository"
-msgstr "Repozitorij"
-
-#: ayatanawebmail/dialog.py:412
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr "Početna stranica"
 
-#: ayatanawebmail/dialog.py:426
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr "Milo Ivir <mail@milotype.de>, 2020."
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
-msgstr "Ayatana Webmail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+#, fuzzy
+msgid "Enable notifications"
+msgstr "Aktiviraj obavijesti:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+#, fuzzy
+msgid "Play sound when new messages arrive."
+msgstr "Odsviraj zvuk, kad se primi poruka:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+#, fuzzy
+msgid "Hide message count"
+msgstr "Otvori poruku/Pokreni naredbu"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+#, fuzzy
+msgid "Run this command when new messages arrive."
+msgstr "Izvrši ovu naredbu kad se primi poruka:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+#, fuzzy
+msgid "Custom sound"
+msgstr "Poseban zvuk za reprodukciju:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+#, fuzzy
+msgid "Play a custom sound when new messages arrive."
+msgstr "Odsviraj zvuk, kad se primi poruka:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+#, fuzzy
+msgid "Merge messages"
+msgstr "Označi poruku kao pročitanu"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+#, fuzzy
+msgid "Merge messages belonging to the same conversation."
+msgstr "Sjedini poruke iz istog razgovora:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+#, fuzzy
+msgid "Message action"
+msgstr "Radnje poruke"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+#, fuzzy
+msgid "Action to perform when a message is activated."
+msgstr "Kad je poruka aktivirana:"
+
+#, python-brace-format
+#~ msgid "You can run \"{command}\" to delete all your login settings."
+#~ msgstr "Za brisanje svih postavaka prijave možeš pokrenuti \"{command}\"."
+
+#~ msgid "Web page"
+#~ msgstr "Web-stranica"
+
+#~ msgid "Command"
+#~ msgstr "Naredba"
+
+#~ msgid ""
+#~ "Please visit the following link and enable access for less secure apps:"
+#~ msgstr ""
+#~ "Posjeti sljedeću poveznicu i aktiviraj pristup za manje sigurne "
+#~ "aplikacije:"
+
+#~ msgid "Access blocked by Google"
+#~ msgstr "Google je blokirao pristup"
+
+#~ msgid "Choose an account"
+#~ msgstr "Odaberite račun"
+
+#~ msgid "Account data"
+#~ msgstr "Podaci računa"
+
+#~ msgid "Links"
+#~ msgstr "Poveznice"
+
+#~ msgid "Login:"
+#~ msgstr "Prijava:"
+
+#~ msgid "Project page"
+#~ msgstr "Stranica projekta"
+
+#~ msgid "Repository"
+#~ msgstr "Repozitorij"
+
+#~ msgid "Ayatana Webmail"
+#~ msgstr "Ayatana Webmail"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:39
-msgid "Webmail notifications and actions for any desktop"
-msgstr "Webmail obavijesti i radnje za bilo koju radnu površinu"
+#~ msgid "Webmail notifications and actions for any desktop"
+#~ msgstr "Webmail obavijesti i radnje za bilo koju radnu površinu"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:74
-msgid "Mark all as read"
-msgstr "Označi sve kao pročitano"
+#~ msgid "Mark all as read"
+#~ msgstr "Označi sve kao pročitano"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:112
-msgid "Compose Mail"
-msgstr "Nova poruka"
+#~ msgid "Compose Mail"
+#~ msgstr "Nova poruka"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:152
-msgid "Sent"
-msgstr "Poslano"
+#~ msgid "Sent"
+#~ msgstr "Poslano"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:228
-msgid "Inbox"
-msgstr "Pristigla pošta"
+#~ msgid "Inbox"
+#~ msgstr "Pristigla pošta"
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
-msgstr "Ayatana Webmail (service)"
+#~ msgid "Ayatana Webmail (service)"
+#~ msgstr "Ayatana Webmail (service)"
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:38
-msgid "Display notifications about new mail"
-msgstr "Prikaz obavijesti o pristigloj pošti"
+#~ msgid "Display notifications about new mail"
+#~ msgstr "Prikaz obavijesti o pristigloj pošti"
diff --git a/po/ht.po b/po/ht.po
index d13c02c..5efd923 100644
--- a/po/ht.po
+++ b/po/ht.po
@@ -6,9 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail 22.6.28\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/"
-"issues\n"
-"POT-Creation-Date: 2020-08-22 20:15+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -18,300 +17,329 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr ""
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr ""
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr ""
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:204
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr ""
 
-#: ayatanawebmail/application.py:211
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr ""
 
-#: ayatanawebmail/application.py:218
-#: data/usr/share/applications/ayatana-webmail.desktop:35
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr ""
 
-#: ayatanawebmail/application.py:957
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:1110
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr ""
 
-#: ayatanawebmail/application.py:1111
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
-msgid "Unable to connect to account \"{accountName}\", the application will now exit."
+msgid ""
+"Unable to connect to account \"{accountName}\", the application will now "
+"exit."
 msgstr ""
 
-#: ayatanawebmail/application.py:1136
+#: /ayatanawebmail/application.py:1131
 #, python-format
-msgid "You have %d unread mail"
-msgid_plural "You have %d unread mails"
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ayatanawebmail/application.py:1163
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr ""
 
-#: ayatanawebmail/application.py:1165
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1167
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1180
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:60
-msgid "If this string starts with http:// or https://, the application will open it in your browser - otherwise, it will be run as a command"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:61
+msgid ""
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:90 ayatanawebmail/dialog.py:104
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:132
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:140
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:141
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:142
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:143
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:204
-msgid "Please visit the following link and enable access for less secure apps:"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:206
-msgid "Access blocked by Google"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:210
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:211
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:234
-msgid "Custom"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:242
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:244
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:286
-msgid "The application will append this string to \"Inbox\" to access a specific message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+#: /ayatanawebmail/dialog.py:276
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:288
+#: /ayatanawebmail/dialog.py:278
 msgid "Account:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:290
+#: /ayatanawebmail/dialog.py:280
 msgid "Server:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:292
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:294
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:296
+#: /ayatanawebmail/dialog.py:286
 msgid "Username:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:298
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:300
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:302
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:296
 msgid "Sent:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:308
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:310
+#: /ayatanawebmail/dialog.py:300
 msgid "Message:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:346
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:347
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:348
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:358
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:360
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:362
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:364
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:369
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:376
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:392
+#: /ayatanawebmail/dialog.py:382
 msgid "Report a bug"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:394
+#: /ayatanawebmail/dialog.py:384
 msgid "Request a feature"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:396 ayatanawebmail/dialog.py:399
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
 #, python-brace-format
 msgid "It's a good idea to add the {labelname} label to your issue."
 msgstr ""
 
-#: ayatanawebmail/dialog.py:397
+#: /ayatanawebmail/dialog.py:387
 msgid "Ask a question"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:400
+#: /ayatanawebmail/dialog.py:390
 msgid "Help translate"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:402
+#: /ayatanawebmail/dialog.py:392
 msgid "Source code"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:404
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:424
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+msgid "Enable notifications"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+msgid "Play sound when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+msgid "Hide message count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:5
-msgid "Display notifications about new mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+msgid "Run this command when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+msgid "Custom sound"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:5
-msgid "Webmail notifications and actions for any desktop"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+msgid "Play a custom sound when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:15
-msgid "Mark all as read"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+msgid "Merge messages"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:20
-msgid "Compose Mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+msgid "Merge messages belonging to the same conversation."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:25
-msgid "Sent"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+msgid "Message action"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:30
-msgid "Inbox"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+msgid "Action to perform when a message is activated."
 msgstr ""
diff --git a/po/hu.po b/po/hu.po
index 02019d8..421d467 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -6,13 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/"
-"issues\n"
-"POT-Creation-Date: 2020-04-03 12:21+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: 2021-02-08 21:50+0000\n"
 "Last-Translator: Ács Zoltán <acszoltan111@gmail.com>\n"
-"Language-Team: Hungarian <https://hosted.weblate.org/projects/"
-"ayatana-indicators/ayatana-webmail/hu/>\n"
+"Language-Team: Hungarian <https://hosted.weblate.org/projects/ayatana-"
+"indicators/ayatana-webmail/hu/>\n"
 "Language: hu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,59 +20,59 @@ msgstr ""
 "X-Generator: Weblate 4.5-dev\n"
 "X-Launchpad-Export-Date: 2020-04-04 05:58+0000\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr "Fiók kiválasztása"
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr "Melyik fiók parancsát/weboldalát szeretné megnyitni?"
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr "Levélműveletek"
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr "Törlés"
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr "Megjelölés olvasottként"
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr "Levél megnyitása / parancs futtatása"
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr "Feladó"
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr "Tárgy"
 
-#: ayatanawebmail/application.py:205
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr "A webmail megnyitása a honlapon"
 
-#: ayatanawebmail/application.py:212
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr "Törlés"
 
-#: ayatanawebmail/application.py:219
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr "Beállítások"
 
-#: ayatanawebmail/application.py:980
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr "Nincs tárgy"
 
-#: ayatanawebmail/application.py:1132
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr "Kapcsolódási hiba"
 
-#: ayatanawebmail/application.py:1133
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
 msgid ""
 "Unable to connect to account \"{accountName}\", the application will now "
@@ -82,258 +81,344 @@ msgstr ""
 "Nem sikerült kapcsolódni a(z) \"{accountName}\" fiókhoz, az alkalmazás ,most "
 "bezárul."
 
-#: ayatanawebmail/application.py:1133
-#, python-brace-format
-msgid "You can run \"{command}\" to delete all your login settings."
-msgstr ""
-
-#: ayatanawebmail/application.py:1158
-#, python-format
-msgid "You have %d unread mail"
-msgid_plural "You have %d unread mails"
+#: /ayatanawebmail/application.py:1131
+#, fuzzy, python-format
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
 msgstr[0] "Ayatana Webmail: %d olvasatlan levél"
 msgstr[1] "Ayatana Webmail: %d olvasatlan levél"
 
-#: ayatanawebmail/application.py:1185
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr "a feladók: %(t0)s, %(t1)s és mások"
 
-#: ayatanawebmail/application.py:1187
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr "a feladók: %(t0)s és %(t1)s"
 
-#: ayatanawebmail/application.py:1189
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr "a feladó: %s"
 
-#: ayatanawebmail/application.py:1202
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr "Új levél érkezett, ettől: %s"
 
-#: ayatanawebmail/dialog.py:60
-msgid "Web page"
-msgstr "Weboldal"
-
-#: ayatanawebmail/dialog.py:61
-msgid "Command"
-msgstr "Parancs"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
+msgstr ""
 
-#: ayatanawebmail/dialog.py:93
+#: /ayatanawebmail/dialog.py:61
 msgid ""
-"Append an additional string - you can use the $MSG_THREAD and $MSG_UID "
-"placeholders."
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:114 ayatanawebmail/dialog.py:128
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr "(nincs)"
 
-#: ayatanawebmail/dialog.py:156
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr "Ayatana Webmail Beállítások"
 
-#: ayatanawebmail/dialog.py:164
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr "Fiókok"
 
-#: ayatanawebmail/dialog.py:165
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr "Beállítások"
 
-#: ayatanawebmail/dialog.py:166
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr "Támogatás"
 
-#: ayatanawebmail/dialog.py:167
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr "Névjegy"
 
-#: ayatanawebmail/dialog.py:228
-msgid ""
-"Please visit the following link and enable access for less secure apps:"
-msgstr ""
-"Nézze meg a következő linket és engedélyezze a hozzáférést kevésbé "
-"biztonságos alkalmazások számára:"
-
-#: ayatanawebmail/dialog.py:230
-msgid "Access blocked by Google"
-msgstr "A hozzáférés blokkolva a Google által"
-
-#: ayatanawebmail/dialog.py:234
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr ""
 "Nem sikerült kapcsolódni a levélfiókhoz. A visszaadott hiba a következő volt:"
 
-#: ayatanawebmail/dialog.py:235
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr "Kapcsolódási hiba"
 
-#: ayatanawebmail/dialog.py:254
-msgid "Choose an account"
-msgstr "Fiók kiválasztása"
-
-#: ayatanawebmail/dialog.py:259
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr "Hozzáadás"
 
-#: ayatanawebmail/dialog.py:261
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr "Eltávolítás"
 
-#: ayatanawebmail/dialog.py:276
-msgid "Server data"
-msgstr "Kiszolgáló adatai"
+#: /ayatanawebmail/dialog.py:276
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+msgstr ""
 
-#: ayatanawebmail/dialog.py:278
-msgid "Account data"
-msgstr "Fiókadatok"
+#: /ayatanawebmail/dialog.py:278
+#, fuzzy
+msgid "Account:"
+msgstr "Fiókok"
 
-#: ayatanawebmail/dialog.py:289
-msgid "Links"
-msgstr "Linkek"
+#: /ayatanawebmail/dialog.py:280
+#, fuzzy
+msgid "Server:"
+msgstr "Kiszolgáló adatai"
 
-#: ayatanawebmail/dialog.py:297
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr "Kiszolgáló:"
 
-#: ayatanawebmail/dialog.py:299
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr "Port:"
 
-#: ayatanawebmail/dialog.py:302
-msgid "Login:"
-msgstr "Felhasználónév:"
+#: /ayatanawebmail/dialog.py:286
+msgid "Username:"
+msgstr ""
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr "Jelszó:"
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr "Mappák:"
 
-#: ayatanawebmail/dialog.py:309
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr "Kezdőlap:"
 
-#: ayatanawebmail/dialog.py:311
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr "Levélírás:"
 
-#: ayatanawebmail/dialog.py:313
+#: /ayatanawebmail/dialog.py:296
+msgid "Sent:"
+msgstr "Elküldött levelek:"
+
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr "Beérkező levelek:"
 
-#: ayatanawebmail/dialog.py:316
-msgid "Sent:"
-msgstr "Elküldött levelek:"
+#: /ayatanawebmail/dialog.py:300
+#, fuzzy
+msgid "Message:"
+msgstr "Levélműveletek"
 
-#: ayatanawebmail/dialog.py:354
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr "Üzenet megjelölése olvasottként"
 
-#: ayatanawebmail/dialog.py:355
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr "Levél megnyitása böngészőben/parancs végrehajtása"
 
-#: ayatanawebmail/dialog.py:356
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr "Kérdezz meg, hogy mit kéne csinálni"
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr "Értesítések engedélyezése:"
 
-#: ayatanawebmail/dialog.py:368
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr "Hang lejátszása üzenet érkezésekor:"
 
-#: ayatanawebmail/dialog.py:370
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr "Azonos témájú levelek csoportosítása:"
 
-#: ayatanawebmail/dialog.py:372
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr "Szám elrejtése amikor nulla:"
 
-#: ayatanawebmail/dialog.py:374
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr "Levél kiválasztásakor:"
 
-#: ayatanawebmail/dialog.py:377
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr "Parancs futtatása üzenet érkezésekor:"
 
-#: ayatanawebmail/dialog.py:384
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr "Egyéni hangfájl:"
 
-#: ayatanawebmail/dialog.py:400
-msgid "Report a bug/Request a feature"
+#: /ayatanawebmail/dialog.py:382
+msgid "Report a bug"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:384
+#, fuzzy
+msgid "Request a feature"
 msgstr "Hiba jelentése / új funkció kérése"
 
-#: ayatanawebmail/dialog.py:402
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
+#, python-brace-format
+msgid "It's a good idea to add the {labelname} label to your issue."
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:387
 msgid "Ask a question"
 msgstr "Kérdés feltevése"
 
-#: ayatanawebmail/dialog.py:404
+#: /ayatanawebmail/dialog.py:390
 msgid "Help translate"
 msgstr "Közreműködés a fordításban"
 
-#: ayatanawebmail/dialog.py:406
-msgid "Project page"
-msgstr "A projekt oldala"
-
-#: ayatanawebmail/dialog.py:408
+#: /ayatanawebmail/dialog.py:392
 msgid "Source code"
 msgstr "Forráskód"
 
-#: ayatanawebmail/dialog.py:410
-msgid "Repository"
-msgstr "Csomagtároló"
-
-#: ayatanawebmail/dialog.py:412
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr "Honlap"
 
-#: ayatanawebmail/dialog.py:426
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Sümegi Csaba https://launchpad.net/~sumegics"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
-msgstr "Ayatana Webmail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+#, fuzzy
+msgid "Enable notifications"
+msgstr "Értesítések engedélyezése:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+#, fuzzy
+msgid "Play sound when new messages arrive."
+msgstr "Hang lejátszása üzenet érkezésekor:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+#, fuzzy
+msgid "Hide message count"
+msgstr "Levél megnyitása / parancs futtatása"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+#, fuzzy
+msgid "Run this command when new messages arrive."
+msgstr "Parancs futtatása üzenet érkezésekor:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+#, fuzzy
+msgid "Custom sound"
+msgstr "Egyéni hangfájl:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+#, fuzzy
+msgid "Play a custom sound when new messages arrive."
+msgstr "Hang lejátszása üzenet érkezésekor:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+#, fuzzy
+msgid "Merge messages"
+msgstr "Üzenet megjelölése olvasottként"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+#, fuzzy
+msgid "Merge messages belonging to the same conversation."
+msgstr "Azonos témájú levelek csoportosítása:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+#, fuzzy
+msgid "Message action"
+msgstr "Levélműveletek"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+#, fuzzy
+msgid "Action to perform when a message is activated."
+msgstr "Levél kiválasztásakor:"
+
+#~ msgid "Web page"
+#~ msgstr "Weboldal"
+
+#~ msgid "Command"
+#~ msgstr "Parancs"
+
+#~ msgid ""
+#~ "Please visit the following link and enable access for less secure apps:"
+#~ msgstr ""
+#~ "Nézze meg a következő linket és engedélyezze a hozzáférést kevésbé "
+#~ "biztonságos alkalmazások számára:"
+
+#~ msgid "Access blocked by Google"
+#~ msgstr "A hozzáférés blokkolva a Google által"
+
+#~ msgid "Choose an account"
+#~ msgstr "Fiók kiválasztása"
+
+#~ msgid "Account data"
+#~ msgstr "Fiókadatok"
+
+#~ msgid "Links"
+#~ msgstr "Linkek"
+
+#~ msgid "Login:"
+#~ msgstr "Felhasználónév:"
+
+#~ msgid "Project page"
+#~ msgstr "A projekt oldala"
+
+#~ msgid "Repository"
+#~ msgstr "Csomagtároló"
+
+#~ msgid "Ayatana Webmail"
+#~ msgstr "Ayatana Webmail"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:39
-msgid "Webmail notifications and actions for any desktop"
-msgstr "Webmail értesítések és műveletek bármelyik asztal számára"
+#~ msgid "Webmail notifications and actions for any desktop"
+#~ msgstr "Webmail értesítések és műveletek bármelyik asztal számára"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:74
-msgid "Mark all as read"
-msgstr "Az összes megjelölése olvasottként"
+#~ msgid "Mark all as read"
+#~ msgstr "Az összes megjelölése olvasottként"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:112
-msgid "Compose Mail"
-msgstr "Levélírás"
+#~ msgid "Compose Mail"
+#~ msgstr "Levélírás"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:152
-msgid "Sent"
-msgstr "Elküldött levelek"
+#~ msgid "Sent"
+#~ msgstr "Elküldött levelek"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:228
-msgid "Inbox"
-msgstr "Beérkező levelek"
+#~ msgid "Inbox"
+#~ msgstr "Beérkező levelek"
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
-msgstr "Ayatana Webmail (szolgáltatás)"
+#~ msgid "Ayatana Webmail (service)"
+#~ msgstr "Ayatana Webmail (szolgáltatás)"
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:38
-msgid "Display notifications about new mail"
-msgstr "Értesítések megjelenítése új levelekről"
+#~ msgid "Display notifications about new mail"
+#~ msgstr "Értesítések megjelenítése új levelekről"
diff --git a/po/hy.po b/po/hy.po
index 6922af1..bbb728e 100644
--- a/po/hy.po
+++ b/po/hy.po
@@ -6,9 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail 22.6.28\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/"
-"issues\n"
-"POT-Creation-Date: 2020-08-22 20:15+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -18,300 +17,329 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr ""
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr ""
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr ""
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:204
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr ""
 
-#: ayatanawebmail/application.py:211
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr ""
 
-#: ayatanawebmail/application.py:218
-#: data/usr/share/applications/ayatana-webmail.desktop:35
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr ""
 
-#: ayatanawebmail/application.py:957
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:1110
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr ""
 
-#: ayatanawebmail/application.py:1111
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
-msgid "Unable to connect to account \"{accountName}\", the application will now exit."
+msgid ""
+"Unable to connect to account \"{accountName}\", the application will now "
+"exit."
 msgstr ""
 
-#: ayatanawebmail/application.py:1136
+#: /ayatanawebmail/application.py:1131
 #, python-format
-msgid "You have %d unread mail"
-msgid_plural "You have %d unread mails"
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ayatanawebmail/application.py:1163
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr ""
 
-#: ayatanawebmail/application.py:1165
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1167
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1180
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:60
-msgid "If this string starts with http:// or https://, the application will open it in your browser - otherwise, it will be run as a command"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:61
+msgid ""
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:90 ayatanawebmail/dialog.py:104
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:132
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:140
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:141
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:142
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:143
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:204
-msgid "Please visit the following link and enable access for less secure apps:"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:206
-msgid "Access blocked by Google"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:210
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:211
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:234
-msgid "Custom"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:242
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:244
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:286
-msgid "The application will append this string to \"Inbox\" to access a specific message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+#: /ayatanawebmail/dialog.py:276
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:288
+#: /ayatanawebmail/dialog.py:278
 msgid "Account:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:290
+#: /ayatanawebmail/dialog.py:280
 msgid "Server:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:292
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:294
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:296
+#: /ayatanawebmail/dialog.py:286
 msgid "Username:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:298
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:300
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:302
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:296
 msgid "Sent:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:308
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:310
+#: /ayatanawebmail/dialog.py:300
 msgid "Message:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:346
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:347
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:348
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:358
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:360
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:362
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:364
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:369
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:376
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:392
+#: /ayatanawebmail/dialog.py:382
 msgid "Report a bug"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:394
+#: /ayatanawebmail/dialog.py:384
 msgid "Request a feature"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:396 ayatanawebmail/dialog.py:399
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
 #, python-brace-format
 msgid "It's a good idea to add the {labelname} label to your issue."
 msgstr ""
 
-#: ayatanawebmail/dialog.py:397
+#: /ayatanawebmail/dialog.py:387
 msgid "Ask a question"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:400
+#: /ayatanawebmail/dialog.py:390
 msgid "Help translate"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:402
+#: /ayatanawebmail/dialog.py:392
 msgid "Source code"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:404
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:424
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+msgid "Enable notifications"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+msgid "Play sound when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+msgid "Hide message count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:5
-msgid "Display notifications about new mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+msgid "Run this command when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+msgid "Custom sound"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:5
-msgid "Webmail notifications and actions for any desktop"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+msgid "Play a custom sound when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:15
-msgid "Mark all as read"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+msgid "Merge messages"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:20
-msgid "Compose Mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+msgid "Merge messages belonging to the same conversation."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:25
-msgid "Sent"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+msgid "Message action"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:30
-msgid "Inbox"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+msgid "Action to perform when a message is activated."
 msgstr ""
diff --git a/po/ia.po b/po/ia.po
index 79b7f64..5c424be 100644
--- a/po/ia.po
+++ b/po/ia.po
@@ -6,9 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail 22.6.28\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/"
-"issues\n"
-"POT-Creation-Date: 2020-08-22 20:15+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -18,300 +17,329 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr ""
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr ""
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr ""
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:204
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr ""
 
-#: ayatanawebmail/application.py:211
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr ""
 
-#: ayatanawebmail/application.py:218
-#: data/usr/share/applications/ayatana-webmail.desktop:35
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr ""
 
-#: ayatanawebmail/application.py:957
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:1110
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr ""
 
-#: ayatanawebmail/application.py:1111
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
-msgid "Unable to connect to account \"{accountName}\", the application will now exit."
+msgid ""
+"Unable to connect to account \"{accountName}\", the application will now "
+"exit."
 msgstr ""
 
-#: ayatanawebmail/application.py:1136
+#: /ayatanawebmail/application.py:1131
 #, python-format
-msgid "You have %d unread mail"
-msgid_plural "You have %d unread mails"
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ayatanawebmail/application.py:1163
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr ""
 
-#: ayatanawebmail/application.py:1165
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1167
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1180
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:60
-msgid "If this string starts with http:// or https://, the application will open it in your browser - otherwise, it will be run as a command"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:61
+msgid ""
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:90 ayatanawebmail/dialog.py:104
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:132
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:140
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:141
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:142
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:143
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:204
-msgid "Please visit the following link and enable access for less secure apps:"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:206
-msgid "Access blocked by Google"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:210
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:211
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:234
-msgid "Custom"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:242
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:244
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:286
-msgid "The application will append this string to \"Inbox\" to access a specific message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+#: /ayatanawebmail/dialog.py:276
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:288
+#: /ayatanawebmail/dialog.py:278
 msgid "Account:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:290
+#: /ayatanawebmail/dialog.py:280
 msgid "Server:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:292
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:294
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:296
+#: /ayatanawebmail/dialog.py:286
 msgid "Username:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:298
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:300
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:302
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:296
 msgid "Sent:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:308
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:310
+#: /ayatanawebmail/dialog.py:300
 msgid "Message:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:346
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:347
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:348
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:358
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:360
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:362
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:364
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:369
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:376
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:392
+#: /ayatanawebmail/dialog.py:382
 msgid "Report a bug"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:394
+#: /ayatanawebmail/dialog.py:384
 msgid "Request a feature"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:396 ayatanawebmail/dialog.py:399
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
 #, python-brace-format
 msgid "It's a good idea to add the {labelname} label to your issue."
 msgstr ""
 
-#: ayatanawebmail/dialog.py:397
+#: /ayatanawebmail/dialog.py:387
 msgid "Ask a question"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:400
+#: /ayatanawebmail/dialog.py:390
 msgid "Help translate"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:402
+#: /ayatanawebmail/dialog.py:392
 msgid "Source code"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:404
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:424
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+msgid "Enable notifications"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+msgid "Play sound when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+msgid "Hide message count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:5
-msgid "Display notifications about new mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+msgid "Run this command when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+msgid "Custom sound"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:5
-msgid "Webmail notifications and actions for any desktop"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+msgid "Play a custom sound when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:15
-msgid "Mark all as read"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+msgid "Merge messages"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:20
-msgid "Compose Mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+msgid "Merge messages belonging to the same conversation."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:25
-msgid "Sent"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+msgid "Message action"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:30
-msgid "Inbox"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+msgid "Action to perform when a message is activated."
 msgstr ""
diff --git a/po/id.po b/po/id.po
index 4570193..2316d24 100644
--- a/po/id.po
+++ b/po/id.po
@@ -6,13 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail 22.6.28\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/"
-"issues\n"
-"POT-Creation-Date: 2020-08-22 20:15+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: 2021-11-11 06:50+0000\n"
 "Last-Translator: mamuiz <mamuiz@hotmail.com>\n"
-"Language-Team: Indonesian <https://hosted.weblate.org/projects/"
-"ayatana-indicators/ayatana-webmail/id/>\n"
+"Language-Team: Indonesian <https://hosted.weblate.org/projects/ayatana-"
+"indicators/ayatana-webmail/id/>\n"
 "Language: id\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,305 +19,343 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Weblate 4.9.1-dev\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr "Pilih akun"
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr "Akun manakah perintah/halaman web yang akan Anda buka?"
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr "Pesan tindakan"
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr "Hapus"
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr "Tandai sudah terbaca"
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr "Bukan pesan/Jalankan perintah"
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr "Pengirim"
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr "Subyek"
 
-#: ayatanawebmail/application.py:204
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr "Buka webmail home page"
 
-#: ayatanawebmail/application.py:211
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr "Bersihkan"
 
-#: ayatanawebmail/application.py:218
-#: data/usr/share/applications/ayatana-webmail.desktop:35
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr "Pengaturan"
 
-#: ayatanawebmail/application.py:957
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr "Tidak ada subyek"
 
-#: ayatanawebmail/application.py:1110
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr "Gangguan koneksi"
 
-#: ayatanawebmail/application.py:1111
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
-msgid "Unable to connect to account \"{accountName}\", the application will now exit."
+msgid ""
+"Unable to connect to account \"{accountName}\", the application will now "
+"exit."
 msgstr ""
 "Tidak dapat terhubung untuk akun \"{accountName}\", akan keluar dari "
 "aplikasi sekarang."
 
-#: ayatanawebmail/application.py:1136
-#, python-format
-msgid "You have %d unread mail"
-msgid_plural "You have %d unread mails"
+#: /ayatanawebmail/application.py:1131
+#, fuzzy, python-format
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
 msgstr[0] "Anda memiliki %d surel belum terbaca"
 
-#: ayatanawebmail/application.py:1163
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr "dari %(t0)s, %(t1)s dan lainnya"
 
-#: ayatanawebmail/application.py:1165
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr "dari %(t0)s dan %(t1)s"
 
-#: ayatanawebmail/application.py:1167
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr "dari %s"
 
-#: ayatanawebmail/application.py:1180
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr "Surel baru dari %s"
 
-#: ayatanawebmail/dialog.py:60
-msgid "If this string starts with http:// or https://, the application will open it in your browser - otherwise, it will be run as a command"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:61
+msgid ""
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
 "Jika string diawali dengan http:// atau https://, aplikasi akan membukanya "
 "di peramban Anda - sebaliknya, akan dijalankan sebagai sebuah perintah"
 
-#: ayatanawebmail/dialog.py:90 ayatanawebmail/dialog.py:104
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr "(Kosong)"
 
-#: ayatanawebmail/dialog.py:132
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr "Pilihan Ayatana Webmail"
 
-#: ayatanawebmail/dialog.py:140
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr "Akun"
 
-#: ayatanawebmail/dialog.py:141
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr "Pilihan"
 
-#: ayatanawebmail/dialog.py:142
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr "Dukungan"
 
-#: ayatanawebmail/dialog.py:143
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr "Perihal"
 
-#: ayatanawebmail/dialog.py:204
-msgid "Please visit the following link and enable access for less secure apps:"
-msgstr ""
-"Mohon kunjungi tautan berikut agar memungkinkan akses untuk aplikasi yang "
-"kurang aman:"
-
-#: ayatanawebmail/dialog.py:206
-msgid "Access blocked by Google"
-msgstr "Akses diblok oleh Google"
-
-#: ayatanawebmail/dialog.py:210
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr "Gagal menyambungkan ke akun surel. Kesalahan sbb:"
 
-#: ayatanawebmail/dialog.py:211
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr "Gangguan koneksi"
 
-#: ayatanawebmail/dialog.py:234
-msgid "Custom"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:242
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr "Tambah"
 
-#: ayatanawebmail/dialog.py:244
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr "Hapus"
 
-#: ayatanawebmail/dialog.py:286
-msgid "The application will append this string to \"Inbox\" to access a specific message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+#: /ayatanawebmail/dialog.py:276
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:288
+#: /ayatanawebmail/dialog.py:278
 msgid "Account:"
 msgstr "Akun:"
 
-#: ayatanawebmail/dialog.py:290
+#: /ayatanawebmail/dialog.py:280
 msgid "Server:"
 msgstr "Server:"
 
-#: ayatanawebmail/dialog.py:292
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:294
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:296
+#: /ayatanawebmail/dialog.py:286
 msgid "Username:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:298
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:300
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:302
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:296
 msgid "Sent:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:308
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:310
+#: /ayatanawebmail/dialog.py:300
 msgid "Message:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:346
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:347
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:348
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:358
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:360
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:362
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:364
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:369
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:376
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:392
+#: /ayatanawebmail/dialog.py:382
 msgid "Report a bug"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:394
+#: /ayatanawebmail/dialog.py:384
 msgid "Request a feature"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:396 ayatanawebmail/dialog.py:399
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
 #, python-brace-format
 msgid "It's a good idea to add the {labelname} label to your issue."
 msgstr ""
 
-#: ayatanawebmail/dialog.py:397
+#: /ayatanawebmail/dialog.py:387
 msgid "Ask a question"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:400
+#: /ayatanawebmail/dialog.py:390
 msgid "Help translate"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:402
+#: /ayatanawebmail/dialog.py:392
 msgid "Source code"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:404
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:424
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:5
-msgid "Display notifications about new mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+msgid "Enable notifications"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:5
-msgid "Webmail notifications and actions for any desktop"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:15
-msgid "Mark all as read"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:20
-msgid "Compose Mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+msgid "Play sound when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:25
-msgid "Sent"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+#, fuzzy
+msgid "Hide message count"
+msgstr "Bukan pesan/Jalankan perintah"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:30
-msgid "Inbox"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
 msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+msgid "Run this command when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+msgid "Custom sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+msgid "Play a custom sound when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+msgid "Merge messages"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+msgid "Merge messages belonging to the same conversation."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+#, fuzzy
+msgid "Message action"
+msgstr "Pesan tindakan"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+msgid "Action to perform when a message is activated."
+msgstr ""
+
+#~ msgid ""
+#~ "Please visit the following link and enable access for less secure apps:"
+#~ msgstr ""
+#~ "Mohon kunjungi tautan berikut agar memungkinkan akses untuk aplikasi yang "
+#~ "kurang aman:"
+
+#~ msgid "Access blocked by Google"
+#~ msgstr "Akses diblok oleh Google"
diff --git a/po/is.po b/po/is.po
index d9c3236..644624b 100644
--- a/po/is.po
+++ b/po/is.po
@@ -6,9 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail 22.6.28\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/"
-"issues\n"
-"POT-Creation-Date: 2020-08-22 20:15+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -18,300 +17,329 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n % 10 != 1 || n % 100 == 11;\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr ""
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr ""
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr ""
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:204
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr ""
 
-#: ayatanawebmail/application.py:211
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr ""
 
-#: ayatanawebmail/application.py:218
-#: data/usr/share/applications/ayatana-webmail.desktop:35
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr ""
 
-#: ayatanawebmail/application.py:957
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:1110
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr ""
 
-#: ayatanawebmail/application.py:1111
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
-msgid "Unable to connect to account \"{accountName}\", the application will now exit."
+msgid ""
+"Unable to connect to account \"{accountName}\", the application will now "
+"exit."
 msgstr ""
 
-#: ayatanawebmail/application.py:1136
+#: /ayatanawebmail/application.py:1131
 #, python-format
-msgid "You have %d unread mail"
-msgid_plural "You have %d unread mails"
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ayatanawebmail/application.py:1163
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr ""
 
-#: ayatanawebmail/application.py:1165
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1167
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1180
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:60
-msgid "If this string starts with http:// or https://, the application will open it in your browser - otherwise, it will be run as a command"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:61
+msgid ""
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:90 ayatanawebmail/dialog.py:104
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:132
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:140
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:141
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:142
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:143
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:204
-msgid "Please visit the following link and enable access for less secure apps:"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:206
-msgid "Access blocked by Google"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:210
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:211
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:234
-msgid "Custom"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:242
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:244
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:286
-msgid "The application will append this string to \"Inbox\" to access a specific message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+#: /ayatanawebmail/dialog.py:276
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:288
+#: /ayatanawebmail/dialog.py:278
 msgid "Account:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:290
+#: /ayatanawebmail/dialog.py:280
 msgid "Server:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:292
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:294
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:296
+#: /ayatanawebmail/dialog.py:286
 msgid "Username:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:298
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:300
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:302
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:296
 msgid "Sent:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:308
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:310
+#: /ayatanawebmail/dialog.py:300
 msgid "Message:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:346
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:347
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:348
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:358
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:360
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:362
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:364
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:369
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:376
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:392
+#: /ayatanawebmail/dialog.py:382
 msgid "Report a bug"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:394
+#: /ayatanawebmail/dialog.py:384
 msgid "Request a feature"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:396 ayatanawebmail/dialog.py:399
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
 #, python-brace-format
 msgid "It's a good idea to add the {labelname} label to your issue."
 msgstr ""
 
-#: ayatanawebmail/dialog.py:397
+#: /ayatanawebmail/dialog.py:387
 msgid "Ask a question"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:400
+#: /ayatanawebmail/dialog.py:390
 msgid "Help translate"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:402
+#: /ayatanawebmail/dialog.py:392
 msgid "Source code"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:404
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:424
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+msgid "Enable notifications"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+msgid "Play sound when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+msgid "Hide message count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:5
-msgid "Display notifications about new mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+msgid "Run this command when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+msgid "Custom sound"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:5
-msgid "Webmail notifications and actions for any desktop"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+msgid "Play a custom sound when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:15
-msgid "Mark all as read"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+msgid "Merge messages"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:20
-msgid "Compose Mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+msgid "Merge messages belonging to the same conversation."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:25
-msgid "Sent"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+msgid "Message action"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:30
-msgid "Inbox"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+msgid "Action to perform when a message is activated."
 msgstr ""
diff --git a/po/it.po b/po/it.po
index 445dacd..896b9b5 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,13 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/"
-"issues\n"
-"POT-Creation-Date: 2020-04-03 12:21+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: 2021-02-23 00:50+0000\n"
 "Last-Translator: J. Lavoie <j.lavoie@net-c.ca>\n"
-"Language-Team: Italian <https://hosted.weblate.org/projects/"
-"ayatana-indicators/ayatana-webmail/it/>\n"
+"Language-Team: Italian <https://hosted.weblate.org/projects/ayatana-"
+"indicators/ayatana-webmail/it/>\n"
 "Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,59 +20,59 @@ msgstr ""
 "X-Generator: Weblate 4.5\n"
 "X-Launchpad-Export-Date: 2020-04-04 05:58+0000\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr "Seleziona account"
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr "Quale comando/pagina web dell'account vorresti aprire?"
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr "Azioni sui messaggi"
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr "Elimina"
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr "Segna come letto"
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr "Apri messaggio/Esegui comando"
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr "Mittente"
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr "Oggetto"
 
-#: ayatanawebmail/application.py:205
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr "Apri la pagina principale della webmail"
 
-#: ayatanawebmail/application.py:212
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr "Pulisci"
 
-#: ayatanawebmail/application.py:219
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr "Impostazioni"
 
-#: ayatanawebmail/application.py:980
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr "Nessun oggetto"
 
-#: ayatanawebmail/application.py:1132
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr "Errore di connessione"
 
-#: ayatanawebmail/application.py:1133
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
 msgid ""
 "Unable to connect to account \"{accountName}\", the application will now "
@@ -82,260 +81,352 @@ msgstr ""
 "Impossibile connettersi all'account «{accountName}», l'applicazione si "
 "chiuderà."
 
-#: ayatanawebmail/application.py:1133
-#, python-brace-format
-msgid "You can run \"{command}\" to delete all your login settings."
-msgstr ""
-"Puoi eseguire «{command}» per eliminare tutte le tue impostazioni di accesso."
-
-#: ayatanawebmail/application.py:1158
-#, python-format
-msgid "You have %d unread mail"
-msgid_plural "You have %d unread mails"
+#: /ayatanawebmail/application.py:1131
+#, fuzzy, python-format
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
 msgstr[0] "C'è %d nuova email"
 msgstr[1] "Ci sono %d nuove email"
 
-#: ayatanawebmail/application.py:1185
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr "Da %(t0)s, %(t1)s e altri"
 
-#: ayatanawebmail/application.py:1187
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr "Da %(t0)s e %(t1)s"
 
-#: ayatanawebmail/application.py:1189
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr "da %s"
 
-#: ayatanawebmail/application.py:1202
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr "Nuova e-mail da %s"
 
-#: ayatanawebmail/dialog.py:60
-msgid "Web page"
-msgstr "Pagina web"
-
-#: ayatanawebmail/dialog.py:61
-msgid "Command"
-msgstr "Comando"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
+msgstr ""
 
-#: ayatanawebmail/dialog.py:93
+#: /ayatanawebmail/dialog.py:61
 msgid ""
-"Append an additional string - you can use the $MSG_THREAD and $MSG_UID "
-"placeholders."
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
-"Aggiungi un'ulteriore stringa di testo - puoi usare le variabili $MSG_THREAD "
-"e $MSG_UID."
 
-#: ayatanawebmail/dialog.py:114 ayatanawebmail/dialog.py:128
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr "(Nessuno)"
 
-#: ayatanawebmail/dialog.py:156
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr "Preferenze di Ayatana Webmail"
 
-#: ayatanawebmail/dialog.py:164
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr "Account"
 
-#: ayatanawebmail/dialog.py:165
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr "Opzioni"
 
-#: ayatanawebmail/dialog.py:166
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr "Supporto"
 
-#: ayatanawebmail/dialog.py:167
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr "Informazioni su"
 
-#: ayatanawebmail/dialog.py:228
-msgid ""
-"Please visit the following link and enable access for less secure apps:"
-msgstr ""
-"Per favore visita il collegamento seguente e abilita l'accesso per le "
-"applicazioni meno sicure:"
-
-#: ayatanawebmail/dialog.py:230
-msgid "Access blocked by Google"
-msgstr "Accesso bloccato da Google"
-
-#: ayatanawebmail/dialog.py:234
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr "Connessione all'account e-mail fallita. Errore:"
 
-#: ayatanawebmail/dialog.py:235
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr "Connessione fallita"
 
-#: ayatanawebmail/dialog.py:254
-msgid "Choose an account"
-msgstr "Scelta dell'account"
-
-#: ayatanawebmail/dialog.py:259
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr "Aggiungi"
 
-#: ayatanawebmail/dialog.py:261
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr "Rimuovi"
 
-#: ayatanawebmail/dialog.py:276
-msgid "Server data"
-msgstr "Dati del server"
+#: /ayatanawebmail/dialog.py:276
+#, fuzzy
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+msgstr ""
+"Aggiungi un'ulteriore stringa di testo - puoi usare le variabili $MSG_THREAD "
+"e $MSG_UID."
 
-#: ayatanawebmail/dialog.py:278
-msgid "Account data"
-msgstr "Dati dell'account"
+#: /ayatanawebmail/dialog.py:278
+#, fuzzy
+msgid "Account:"
+msgstr "Account"
 
-#: ayatanawebmail/dialog.py:289
-msgid "Links"
-msgstr "Collegamenti"
+#: /ayatanawebmail/dialog.py:280
+#, fuzzy
+msgid "Server:"
+msgstr "Dati del server"
 
-#: ayatanawebmail/dialog.py:297
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr "Host:"
 
-#: ayatanawebmail/dialog.py:299
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr "Porta:"
 
-#: ayatanawebmail/dialog.py:302
-msgid "Login:"
-msgstr "Nome utente:"
+#: /ayatanawebmail/dialog.py:286
+msgid "Username:"
+msgstr ""
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr "Password:"
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr "Cartelle:"
 
-#: ayatanawebmail/dialog.py:309
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr "Home:"
 
-#: ayatanawebmail/dialog.py:311
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr "Composizione nuovo messaggio:"
 
-#: ayatanawebmail/dialog.py:313
+#: /ayatanawebmail/dialog.py:296
+msgid "Sent:"
+msgstr "Posta inviata:"
+
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr "Posta in arrivo:"
 
-#: ayatanawebmail/dialog.py:316
-msgid "Sent:"
-msgstr "Posta inviata:"
+#: /ayatanawebmail/dialog.py:300
+#, fuzzy
+msgid "Message:"
+msgstr "Azioni sui messaggi"
 
-#: ayatanawebmail/dialog.py:354
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr "Segna messaggio come letto"
 
-#: ayatanawebmail/dialog.py:355
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr "Apri messaggio nel browser/Esegui comando"
 
-#: ayatanawebmail/dialog.py:356
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr "Chiedimi cosa fare"
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr "Abilitare le notifiche:"
 
-#: ayatanawebmail/dialog.py:368
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr "Riproduci un suono alla ricezione di un messaggio:"
 
-#: ayatanawebmail/dialog.py:370
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr "Unisci i messaggi della stessa conversazione:"
 
-#: ayatanawebmail/dialog.py:372
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr "Nascondi conteggio quando nullo:"
 
-#: ayatanawebmail/dialog.py:374
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr "Quando un messaggio è selezionato:"
 
-#: ayatanawebmail/dialog.py:377
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr "Esegui questo comando quando un messaggio è stato ricevuto:"
 
-#: ayatanawebmail/dialog.py:384
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr "Suono personalizzato:"
 
-#: ayatanawebmail/dialog.py:400
-msgid "Report a bug/Request a feature"
+#: /ayatanawebmail/dialog.py:382
+msgid "Report a bug"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:384
+#, fuzzy
+msgid "Request a feature"
 msgstr "Segnala un errore/Richiedi una funzionalità"
 
-#: ayatanawebmail/dialog.py:402
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
+#, python-brace-format
+msgid "It's a good idea to add the {labelname} label to your issue."
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:387
 msgid "Ask a question"
 msgstr "Fai una domanda"
 
-#: ayatanawebmail/dialog.py:404
+#: /ayatanawebmail/dialog.py:390
 msgid "Help translate"
 msgstr "Aiuta a tradurre"
 
-#: ayatanawebmail/dialog.py:406
-msgid "Project page"
-msgstr "Pagina del progeto"
-
-#: ayatanawebmail/dialog.py:408
+#: /ayatanawebmail/dialog.py:392
 msgid "Source code"
 msgstr "Codice sorgente"
 
-#: ayatanawebmail/dialog.py:410
-msgid "Repository"
-msgstr "Repository"
-
-#: ayatanawebmail/dialog.py:412
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr "Pagina principale"
 
-#: ayatanawebmail/dialog.py:426
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Emanuele Antonio Faraone https://launchpad.net/~emanueleant03"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
-msgstr "Ayatana Webmail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+#, fuzzy
+msgid "Enable notifications"
+msgstr "Abilitare le notifiche:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+#, fuzzy
+msgid "Play sound when new messages arrive."
+msgstr "Riproduci un suono alla ricezione di un messaggio:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+#, fuzzy
+msgid "Hide message count"
+msgstr "Apri messaggio/Esegui comando"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+#, fuzzy
+msgid "Run this command when new messages arrive."
+msgstr "Esegui questo comando quando un messaggio è stato ricevuto:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+#, fuzzy
+msgid "Custom sound"
+msgstr "Suono personalizzato:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+#, fuzzy
+msgid "Play a custom sound when new messages arrive."
+msgstr "Riproduci un suono alla ricezione di un messaggio:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+#, fuzzy
+msgid "Merge messages"
+msgstr "Segna messaggio come letto"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+#, fuzzy
+msgid "Merge messages belonging to the same conversation."
+msgstr "Unisci i messaggi della stessa conversazione:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+#, fuzzy
+msgid "Message action"
+msgstr "Azioni sui messaggi"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+#, fuzzy
+msgid "Action to perform when a message is activated."
+msgstr "Quando un messaggio è selezionato:"
+
+#, python-brace-format
+#~ msgid "You can run \"{command}\" to delete all your login settings."
+#~ msgstr ""
+#~ "Puoi eseguire «{command}» per eliminare tutte le tue impostazioni di "
+#~ "accesso."
+
+#~ msgid "Web page"
+#~ msgstr "Pagina web"
+
+#~ msgid "Command"
+#~ msgstr "Comando"
+
+#~ msgid ""
+#~ "Please visit the following link and enable access for less secure apps:"
+#~ msgstr ""
+#~ "Per favore visita il collegamento seguente e abilita l'accesso per le "
+#~ "applicazioni meno sicure:"
+
+#~ msgid "Access blocked by Google"
+#~ msgstr "Accesso bloccato da Google"
+
+#~ msgid "Choose an account"
+#~ msgstr "Scelta dell'account"
+
+#~ msgid "Account data"
+#~ msgstr "Dati dell'account"
+
+#~ msgid "Links"
+#~ msgstr "Collegamenti"
+
+#~ msgid "Login:"
+#~ msgstr "Nome utente:"
+
+#~ msgid "Project page"
+#~ msgstr "Pagina del progeto"
+
+#~ msgid "Repository"
+#~ msgstr "Repository"
+
+#~ msgid "Ayatana Webmail"
+#~ msgstr "Ayatana Webmail"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:39
-msgid "Webmail notifications and actions for any desktop"
-msgstr "Notifiche e azioni webmail per qualsiasi desktop"
+#~ msgid "Webmail notifications and actions for any desktop"
+#~ msgstr "Notifiche e azioni webmail per qualsiasi desktop"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:74
-msgid "Mark all as read"
-msgstr "Segna tutti come letti"
+#~ msgid "Mark all as read"
+#~ msgstr "Segna tutti come letti"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:112
-msgid "Compose Mail"
-msgstr "Componi nuovo messaggio"
+#~ msgid "Compose Mail"
+#~ msgstr "Componi nuovo messaggio"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:152
-msgid "Sent"
-msgstr "Inviata"
+#~ msgid "Sent"
+#~ msgstr "Inviata"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:228
-msgid "Inbox"
-msgstr "In arrivo"
+#~ msgid "Inbox"
+#~ msgstr "In arrivo"
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
-msgstr "Ayatana Webmail (servizio)"
+#~ msgid "Ayatana Webmail (service)"
+#~ msgstr "Ayatana Webmail (servizio)"
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:38
-msgid "Display notifications about new mail"
-msgstr "Mostra le notifiche per le nuove e-mail"
+#~ msgid "Display notifications about new mail"
+#~ msgstr "Mostra le notifiche per le nuove e-mail"
diff --git a/po/it_CARES.po b/po/it_CARES.po
index 1d94033..f86b232 100644
--- a/po/it_CARES.po
+++ b/po/it_CARES.po
@@ -6,9 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail 22.6.28\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/"
-"issues\n"
-"POT-Creation-Date: 2020-08-22 20:15+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -18,300 +17,329 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr ""
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr ""
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr ""
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:204
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr ""
 
-#: ayatanawebmail/application.py:211
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr ""
 
-#: ayatanawebmail/application.py:218
-#: data/usr/share/applications/ayatana-webmail.desktop:35
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr ""
 
-#: ayatanawebmail/application.py:957
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:1110
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr ""
 
-#: ayatanawebmail/application.py:1111
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
-msgid "Unable to connect to account \"{accountName}\", the application will now exit."
+msgid ""
+"Unable to connect to account \"{accountName}\", the application will now "
+"exit."
 msgstr ""
 
-#: ayatanawebmail/application.py:1136
+#: /ayatanawebmail/application.py:1131
 #, python-format
-msgid "You have %d unread mail"
-msgid_plural "You have %d unread mails"
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ayatanawebmail/application.py:1163
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr ""
 
-#: ayatanawebmail/application.py:1165
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1167
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1180
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:60
-msgid "If this string starts with http:// or https://, the application will open it in your browser - otherwise, it will be run as a command"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:61
+msgid ""
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:90 ayatanawebmail/dialog.py:104
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:132
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:140
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:141
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:142
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:143
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:204
-msgid "Please visit the following link and enable access for less secure apps:"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:206
-msgid "Access blocked by Google"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:210
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:211
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:234
-msgid "Custom"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:242
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:244
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:286
-msgid "The application will append this string to \"Inbox\" to access a specific message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+#: /ayatanawebmail/dialog.py:276
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:288
+#: /ayatanawebmail/dialog.py:278
 msgid "Account:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:290
+#: /ayatanawebmail/dialog.py:280
 msgid "Server:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:292
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:294
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:296
+#: /ayatanawebmail/dialog.py:286
 msgid "Username:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:298
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:300
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:302
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:296
 msgid "Sent:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:308
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:310
+#: /ayatanawebmail/dialog.py:300
 msgid "Message:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:346
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:347
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:348
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:358
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:360
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:362
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:364
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:369
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:376
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:392
+#: /ayatanawebmail/dialog.py:382
 msgid "Report a bug"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:394
+#: /ayatanawebmail/dialog.py:384
 msgid "Request a feature"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:396 ayatanawebmail/dialog.py:399
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
 #, python-brace-format
 msgid "It's a good idea to add the {labelname} label to your issue."
 msgstr ""
 
-#: ayatanawebmail/dialog.py:397
+#: /ayatanawebmail/dialog.py:387
 msgid "Ask a question"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:400
+#: /ayatanawebmail/dialog.py:390
 msgid "Help translate"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:402
+#: /ayatanawebmail/dialog.py:392
 msgid "Source code"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:404
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:424
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+msgid "Enable notifications"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+msgid "Play sound when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+msgid "Hide message count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:5
-msgid "Display notifications about new mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+msgid "Run this command when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+msgid "Custom sound"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:5
-msgid "Webmail notifications and actions for any desktop"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+msgid "Play a custom sound when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:15
-msgid "Mark all as read"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+msgid "Merge messages"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:20
-msgid "Compose Mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+msgid "Merge messages belonging to the same conversation."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:25
-msgid "Sent"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+msgid "Message action"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:30
-msgid "Inbox"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+msgid "Action to perform when a message is activated."
 msgstr ""
diff --git a/po/ja.po b/po/ja.po
index 58bf5bb..4dab7c7 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,13 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/"
-"issues\n"
-"POT-Creation-Date: 2020-04-03 12:21+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: 2020-10-23 08:26+0000\n"
 "Last-Translator: Kei Homma <kei.homma@soundmouse.co.jp>\n"
-"Language-Team: Japanese <https://hosted.weblate.org/projects/"
-"ayatana-indicators/ayatana-webmail/ja/>\n"
+"Language-Team: Japanese <https://hosted.weblate.org/projects/ayatana-"
+"indicators/ayatana-webmail/ja/>\n"
 "Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,311 +20,394 @@ msgstr ""
 "X-Generator: Weblate 4.3.1\n"
 "X-Launchpad-Export-Date: 2020-04-04 05:58+0000\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr "アカウントを選択ください"
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr "どのアカウントのコマンドや ウェブページを開きますか？"
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr "メッセージのアクション"
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr "削除"
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr "既読にする"
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr "メッセージを開く/コマンドを実行"
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr "送信者"
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr "件名"
 
-#: ayatanawebmail/application.py:205
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr "ウェブメールのホームページを開く"
 
-#: ayatanawebmail/application.py:212
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr "クリア"
 
-#: ayatanawebmail/application.py:219
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr "設定"
 
-#: ayatanawebmail/application.py:980
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr "件名なし"
 
-#: ayatanawebmail/application.py:1132
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr "接続エラー"
 
-#: ayatanawebmail/application.py:1133
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
 msgid ""
 "Unable to connect to account \"{accountName}\", the application will now "
 "exit."
-msgstr "アカウント「{accountName}」に接続出来ません、アプリケーションが終了します."
-
-#: ayatanawebmail/application.py:1133
-#, python-brace-format
-msgid "You can run \"{command}\" to delete all your login settings."
-msgstr "{command}より全てのログイン設定を消去することができます。"
+msgstr ""
+"アカウント「{accountName}」に接続出来ません、アプリケーションが終了します."
 
-#: ayatanawebmail/application.py:1158
-#, python-format
-msgid "You have %d unread mail"
-msgid_plural "You have %d unread mails"
+#: /ayatanawebmail/application.py:1131
+#, fuzzy, python-format
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
 msgstr[0] "%d 未読メールがあります"
 
-#: ayatanawebmail/application.py:1185
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr "%(t0)s、%(t1)sなどから"
 
-#: ayatanawebmail/application.py:1187
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1189
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr "%sから"
 
-#: ayatanawebmail/application.py:1202
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr "%sからの新着メール"
 
-#: ayatanawebmail/dialog.py:60
-msgid "Web page"
-msgstr "ウェブページ"
-
-#: ayatanawebmail/dialog.py:61
-msgid "Command"
-msgstr "コマンド"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
+msgstr ""
 
-#: ayatanawebmail/dialog.py:93
+#: /ayatanawebmail/dialog.py:61
 msgid ""
-"Append an additional string - you can use the $MSG_THREAD and $MSG_UID "
-"placeholders."
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:114 ayatanawebmail/dialog.py:128
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr "(なし)"
 
-#: ayatanawebmail/dialog.py:156
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr "Ayatanaウェブメールの設定"
 
-#: ayatanawebmail/dialog.py:164
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr "アカウント"
 
-#: ayatanawebmail/dialog.py:165
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr "オプション"
 
-#: ayatanawebmail/dialog.py:166
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr "サポート"
 
-#: ayatanawebmail/dialog.py:167
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr "について"
 
-#: ayatanawebmail/dialog.py:228
-msgid ""
-"Please visit the following link and enable access for less secure apps:"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:230
-msgid "Access blocked by Google"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:234
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr "メールアカウントに接続できませんでした。返されたエラーは:"
 
-#: ayatanawebmail/dialog.py:235
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr "接続に失敗しました"
 
-#: ayatanawebmail/dialog.py:254
-msgid "Choose an account"
-msgstr "アカウントを選択"
-
-#: ayatanawebmail/dialog.py:259
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr "追加する"
 
-#: ayatanawebmail/dialog.py:261
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr "削除"
 
-#: ayatanawebmail/dialog.py:276
-msgid "Server data"
-msgstr "サーバーの情報"
+#: /ayatanawebmail/dialog.py:276
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+msgstr ""
 
-#: ayatanawebmail/dialog.py:278
-msgid "Account data"
-msgstr "アカウント情報"
+#: /ayatanawebmail/dialog.py:278
+#, fuzzy
+msgid "Account:"
+msgstr "アカウント"
 
-#: ayatanawebmail/dialog.py:289
-msgid "Links"
-msgstr "リンク"
+#: /ayatanawebmail/dialog.py:280
+#, fuzzy
+msgid "Server:"
+msgstr "サーバーの情報"
 
-#: ayatanawebmail/dialog.py:297
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr "ホスト："
 
-#: ayatanawebmail/dialog.py:299
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr "ポート:"
 
-#: ayatanawebmail/dialog.py:302
-msgid "Login:"
-msgstr "ログイン名:"
+#: /ayatanawebmail/dialog.py:286
+msgid "Username:"
+msgstr ""
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr "パスワード:"
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr "フォルダー:"
 
-#: ayatanawebmail/dialog.py:309
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr "ホーム:"
 
-#: ayatanawebmail/dialog.py:311
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr "作成:"
 
-#: ayatanawebmail/dialog.py:313
+#: /ayatanawebmail/dialog.py:296
+msgid "Sent:"
+msgstr "送信済み:"
+
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr "受信トレイ:"
 
-#: ayatanawebmail/dialog.py:316
-msgid "Sent:"
-msgstr "送信済み:"
+#: /ayatanawebmail/dialog.py:300
+#, fuzzy
+msgid "Message:"
+msgstr "メッセージのアクション"
 
-#: ayatanawebmail/dialog.py:354
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr "メッセージを既読にする"
 
-#: ayatanawebmail/dialog.py:355
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr "ブラウザでメッセージを開く/コマンドを実行する"
 
-#: ayatanawebmail/dialog.py:356
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr "通知を有効にする:"
 
-#: ayatanawebmail/dialog.py:368
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr "メッセージを受信した時に音を鳴らします:"
 
-#: ayatanawebmail/dialog.py:370
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:372
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr "ゼロの時にカウントを非表示にします:"
 
-#: ayatanawebmail/dialog.py:374
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr "メッセージがアクティブ化された場合:"
 
-#: ayatanawebmail/dialog.py:377
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr "メッセージを受信した時にこのコマンドを実行します:"
 
-#: ayatanawebmail/dialog.py:384
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr "再生するカスタムサウンド:"
 
-#: ayatanawebmail/dialog.py:400
-msgid "Report a bug/Request a feature"
+#: /ayatanawebmail/dialog.py:382
+msgid "Report a bug"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:384
+#, fuzzy
+msgid "Request a feature"
 msgstr "バグを報告する/機能をリクエストする"
 
-#: ayatanawebmail/dialog.py:402
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
+#, python-brace-format
+msgid "It's a good idea to add the {labelname} label to your issue."
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:387
 msgid "Ask a question"
 msgstr "質問する"
 
-#: ayatanawebmail/dialog.py:404
+#: /ayatanawebmail/dialog.py:390
 msgid "Help translate"
 msgstr "翻訳を手伝う"
 
-#: ayatanawebmail/dialog.py:406
-msgid "Project page"
-msgstr "プロジェクトページ"
-
-#: ayatanawebmail/dialog.py:408
+#: /ayatanawebmail/dialog.py:392
 msgid "Source code"
 msgstr "ソースコード"
 
-#: ayatanawebmail/dialog.py:410
-msgid "Repository"
-msgstr "リポジトリ"
-
-#: ayatanawebmail/dialog.py:412
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr "ホームページ"
 
-#: ayatanawebmail/dialog.py:426
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
-msgstr "Ayatana ウェブメール"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+#, fuzzy
+msgid "Enable notifications"
+msgstr "通知を有効にする:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+#, fuzzy
+msgid "Play sound when new messages arrive."
+msgstr "メッセージを受信した時に音を鳴らします:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+#, fuzzy
+msgid "Hide message count"
+msgstr "メッセージを開く/コマンドを実行"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+#, fuzzy
+msgid "Run this command when new messages arrive."
+msgstr "メッセージを受信した時にこのコマンドを実行します:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+#, fuzzy
+msgid "Custom sound"
+msgstr "再生するカスタムサウンド:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+#, fuzzy
+msgid "Play a custom sound when new messages arrive."
+msgstr "メッセージを受信した時に音を鳴らします:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+#, fuzzy
+msgid "Merge messages"
+msgstr "メッセージを既読にする"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+msgid "Merge messages belonging to the same conversation."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+#, fuzzy
+msgid "Message action"
+msgstr "メッセージのアクション"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+#, fuzzy
+msgid "Action to perform when a message is activated."
+msgstr "メッセージがアクティブ化された場合:"
+
+#, python-brace-format
+#~ msgid "You can run \"{command}\" to delete all your login settings."
+#~ msgstr "{command}より全てのログイン設定を消去することができます。"
+
+#~ msgid "Web page"
+#~ msgstr "ウェブページ"
+
+#~ msgid "Command"
+#~ msgstr "コマンド"
+
+#~ msgid "Choose an account"
+#~ msgstr "アカウントを選択"
+
+#~ msgid "Account data"
+#~ msgstr "アカウント情報"
+
+#~ msgid "Links"
+#~ msgstr "リンク"
+
+#~ msgid "Login:"
+#~ msgstr "ログイン名:"
+
+#~ msgid "Project page"
+#~ msgstr "プロジェクトページ"
+
+#~ msgid "Repository"
+#~ msgstr "リポジトリ"
+
+#~ msgid "Ayatana Webmail"
+#~ msgstr "Ayatana ウェブメール"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:39
-msgid "Webmail notifications and actions for any desktop"
-msgstr "デスクトップのウェブメール通知とアクション"
+#~ msgid "Webmail notifications and actions for any desktop"
+#~ msgstr "デスクトップのウェブメール通知とアクション"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:74
-msgid "Mark all as read"
-msgstr "すべて既読にする"
+#~ msgid "Mark all as read"
+#~ msgstr "すべて既読にする"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:112
-msgid "Compose Mail"
-msgstr "メールを作成する"
+#~ msgid "Compose Mail"
+#~ msgstr "メールを作成する"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:152
-msgid "Sent"
-msgstr "送信済み"
+#~ msgid "Sent"
+#~ msgstr "送信済み"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:228
-msgid "Inbox"
-msgstr "受信トレイ"
+#~ msgid "Inbox"
+#~ msgstr "受信トレイ"
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
-msgstr "Ayatana ウェブメール (サービス)"
+#~ msgid "Ayatana Webmail (service)"
+#~ msgstr "Ayatana ウェブメール (サービス)"
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:38
-msgid "Display notifications about new mail"
-msgstr "新着メールの通知を表示"
+#~ msgid "Display notifications about new mail"
+#~ msgstr "新着メールの通知を表示"
diff --git a/po/ka.po b/po/ka.po
index d01fb2f..69d6dfa 100644
--- a/po/ka.po
+++ b/po/ka.po
@@ -6,9 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail 22.6.28\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/"
-"issues\n"
-"POT-Creation-Date: 2020-08-22 20:15+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -18,300 +17,329 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr ""
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr ""
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr ""
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:204
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr ""
 
-#: ayatanawebmail/application.py:211
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr ""
 
-#: ayatanawebmail/application.py:218
-#: data/usr/share/applications/ayatana-webmail.desktop:35
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr ""
 
-#: ayatanawebmail/application.py:957
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:1110
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr ""
 
-#: ayatanawebmail/application.py:1111
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
-msgid "Unable to connect to account \"{accountName}\", the application will now exit."
+msgid ""
+"Unable to connect to account \"{accountName}\", the application will now "
+"exit."
 msgstr ""
 
-#: ayatanawebmail/application.py:1136
+#: /ayatanawebmail/application.py:1131
 #, python-format
-msgid "You have %d unread mail"
-msgid_plural "You have %d unread mails"
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ayatanawebmail/application.py:1163
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr ""
 
-#: ayatanawebmail/application.py:1165
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1167
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1180
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:60
-msgid "If this string starts with http:// or https://, the application will open it in your browser - otherwise, it will be run as a command"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:61
+msgid ""
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:90 ayatanawebmail/dialog.py:104
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:132
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:140
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:141
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:142
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:143
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:204
-msgid "Please visit the following link and enable access for less secure apps:"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:206
-msgid "Access blocked by Google"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:210
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:211
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:234
-msgid "Custom"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:242
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:244
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:286
-msgid "The application will append this string to \"Inbox\" to access a specific message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+#: /ayatanawebmail/dialog.py:276
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:288
+#: /ayatanawebmail/dialog.py:278
 msgid "Account:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:290
+#: /ayatanawebmail/dialog.py:280
 msgid "Server:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:292
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:294
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:296
+#: /ayatanawebmail/dialog.py:286
 msgid "Username:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:298
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:300
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:302
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:296
 msgid "Sent:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:308
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:310
+#: /ayatanawebmail/dialog.py:300
 msgid "Message:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:346
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:347
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:348
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:358
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:360
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:362
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:364
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:369
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:376
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:392
+#: /ayatanawebmail/dialog.py:382
 msgid "Report a bug"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:394
+#: /ayatanawebmail/dialog.py:384
 msgid "Request a feature"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:396 ayatanawebmail/dialog.py:399
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
 #, python-brace-format
 msgid "It's a good idea to add the {labelname} label to your issue."
 msgstr ""
 
-#: ayatanawebmail/dialog.py:397
+#: /ayatanawebmail/dialog.py:387
 msgid "Ask a question"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:400
+#: /ayatanawebmail/dialog.py:390
 msgid "Help translate"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:402
+#: /ayatanawebmail/dialog.py:392
 msgid "Source code"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:404
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:424
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+msgid "Enable notifications"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+msgid "Play sound when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+msgid "Hide message count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:5
-msgid "Display notifications about new mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+msgid "Run this command when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+msgid "Custom sound"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:5
-msgid "Webmail notifications and actions for any desktop"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+msgid "Play a custom sound when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:15
-msgid "Mark all as read"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+msgid "Merge messages"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:20
-msgid "Compose Mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+msgid "Merge messages belonging to the same conversation."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:25
-msgid "Sent"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+msgid "Message action"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:30
-msgid "Inbox"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+msgid "Action to perform when a message is activated."
 msgstr ""
diff --git a/po/kk.po b/po/kk.po
index cde19c8..cd0ee75 100755
--- a/po/kk.po
+++ b/po/kk.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/issues\n"
-"POT-Creation-Date: 2020-04-03 12:21+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: 2018-06-04 07:33+0000\n"
 "Language-Team: Kazakh <kk@li.org>\n"
+"Language: kk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -17,312 +18,359 @@ msgstr ""
 "X-Launchpad-Export-Date: 2020-04-04 05:58+0000\n"
 "X-Generator: Launchpad (build a296f04231dee355be5db73cc878b9e21689a253)\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr ""
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr ""
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr ""
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:205
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr ""
 
-#: ayatanawebmail/application.py:212
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr ""
 
-#: ayatanawebmail/application.py:219
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr ""
 
-#: ayatanawebmail/application.py:980
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr "Тақырыбы жоқ"
 
-#: ayatanawebmail/application.py:1132
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr ""
 
-#: ayatanawebmail/application.py:1133
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
 msgid ""
 "Unable to connect to account \"{accountName}\", the application will now "
 "exit."
 msgstr ""
 
-#: ayatanawebmail/application.py:1133
-#, python-brace-format
-msgid "You can run \"{command}\" to delete all your login settings."
-msgstr ""
-
-#: ayatanawebmail/application.py:1158
+#: /ayatanawebmail/application.py:1131
 #, python-format
-msgid "You have %d unread mail"
-msgid_plural "You have %d unread mails"
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ayatanawebmail/application.py:1185
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr ""
 
-#: ayatanawebmail/application.py:1187
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1189
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1202
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr "%s жаңа хат келді"
 
-#: ayatanawebmail/dialog.py:60
-msgid "Web page"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:61
-msgid "Command"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:93
+#: /ayatanawebmail/dialog.py:61
 msgid ""
-"Append an additional string - you can use the $MSG_THREAD and $MSG_UID "
-"placeholders."
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:114 ayatanawebmail/dialog.py:128
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:156
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr "Ayatana Webmail баптаулары"
 
-#: ayatanawebmail/dialog.py:164
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr "Тіркемелер"
 
-#: ayatanawebmail/dialog.py:165
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr "Баптаулар"
 
-#: ayatanawebmail/dialog.py:166
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:167
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:228
-msgid ""
-"Please visit the following link and enable access for less secure apps:"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:230
-msgid "Access blocked by Google"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:234
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:235
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:254
-msgid "Choose an account"
-msgstr "Тіркемені таңдаңыз"
-
-#: ayatanawebmail/dialog.py:259
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:261
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:276
-msgid "Server data"
-msgstr "Сервер мәліметтері"
+#: /ayatanawebmail/dialog.py:276
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+msgstr ""
 
-#: ayatanawebmail/dialog.py:278
-msgid "Account data"
-msgstr "Тіркеме мәліметтері"
+#: /ayatanawebmail/dialog.py:278
+#, fuzzy
+msgid "Account:"
+msgstr "Тіркемелер"
 
-#: ayatanawebmail/dialog.py:289
-msgid "Links"
-msgstr ""
+#: /ayatanawebmail/dialog.py:280
+#, fuzzy
+msgid "Server:"
+msgstr "Сервер мәліметтері"
 
-#: ayatanawebmail/dialog.py:297
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr "Хост аты:"
 
-#: ayatanawebmail/dialog.py:299
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr "Порт:"
 
-#: ayatanawebmail/dialog.py:302
-msgid "Login:"
-msgstr "Пайдаланушы аты:"
+#: /ayatanawebmail/dialog.py:286
+msgid "Username:"
+msgstr ""
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr "Құпия сөз:"
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:309
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr "Басты"
 
-#: ayatanawebmail/dialog.py:311
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr "Жазу:"
 
-#: ayatanawebmail/dialog.py:313
+#: /ayatanawebmail/dialog.py:296
+msgid "Sent:"
+msgstr "Жіберілген:"
+
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr "Кіріс:"
 
-#: ayatanawebmail/dialog.py:316
-msgid "Sent:"
-msgstr "Жіберілген:"
+#: /ayatanawebmail/dialog.py:300
+msgid "Message:"
+msgstr ""
 
-#: ayatanawebmail/dialog.py:354
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:355
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:356
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr "Мәлімдемелерді қолдану:"
 
-#: ayatanawebmail/dialog.py:368
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:370
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:372
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:374
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:377
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:384
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:400
-msgid "Report a bug/Request a feature"
+#: /ayatanawebmail/dialog.py:382
+msgid "Report a bug"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:402
-msgid "Ask a question"
+#: /ayatanawebmail/dialog.py:384
+msgid "Request a feature"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:404
-msgid "Help translate"
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
+#, python-brace-format
+msgid "It's a good idea to add the {labelname} label to your issue."
 msgstr ""
 
-#: ayatanawebmail/dialog.py:406
-msgid "Project page"
+#: /ayatanawebmail/dialog.py:387
+msgid "Ask a question"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:408
-msgid "Source code"
+#: /ayatanawebmail/dialog.py:390
+msgid "Help translate"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:410
-msgid "Repository"
+#: /ayatanawebmail/dialog.py:392
+msgid "Source code"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:412
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:426
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
-msgstr "Ayatana Webmail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+#, fuzzy
+msgid "Enable notifications"
+msgstr "Мәлімдемелерді қолдану:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+msgid "Play sound when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+msgid "Hide message count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:39
-msgid "Webmail notifications and actions for any desktop"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:74
-msgid "Mark all as read"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+msgid "Run this command when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:112
-msgid "Compose Mail"
-msgstr "Хат жазу"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+msgid "Custom sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+msgid "Play a custom sound when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+msgid "Merge messages"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+msgid "Merge messages belonging to the same conversation."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+msgid "Message action"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+msgid "Action to perform when a message is activated."
+msgstr ""
+
+#~ msgid "Choose an account"
+#~ msgstr "Тіркемені таңдаңыз"
+
+#~ msgid "Account data"
+#~ msgstr "Тіркеме мәліметтері"
+
+#~ msgid "Login:"
+#~ msgstr "Пайдаланушы аты:"
+
+#~ msgid "Ayatana Webmail"
+#~ msgstr "Ayatana Webmail"
+
+#~ msgid "Compose Mail"
+#~ msgstr "Хат жазу"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:152
-msgid "Sent"
-msgstr "Жіберілген"
+#~ msgid "Sent"
+#~ msgstr "Жіберілген"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:228
-msgid "Inbox"
-msgstr "Кіріс"
+#~ msgid "Inbox"
+#~ msgstr "Кіріс"
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
-msgstr "Ayatana Webmail (қызмет)"
+#~ msgid "Ayatana Webmail (service)"
+#~ msgstr "Ayatana Webmail (қызмет)"
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:38
-msgid "Display notifications about new mail"
-msgstr "Жаңа хаттар келгені жайлы мәлімдеу"
+#~ msgid "Display notifications about new mail"
+#~ msgstr "Жаңа хаттар келгені жайлы мәлімдеу"
diff --git a/po/kl.po b/po/kl.po
index c921545..1d01488 100644
--- a/po/kl.po
+++ b/po/kl.po
@@ -6,9 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail 22.6.28\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/"
-"issues\n"
-"POT-Creation-Date: 2020-08-22 20:15+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -18,300 +17,329 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr ""
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr ""
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr ""
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:204
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr ""
 
-#: ayatanawebmail/application.py:211
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr ""
 
-#: ayatanawebmail/application.py:218
-#: data/usr/share/applications/ayatana-webmail.desktop:35
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr ""
 
-#: ayatanawebmail/application.py:957
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:1110
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr ""
 
-#: ayatanawebmail/application.py:1111
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
-msgid "Unable to connect to account \"{accountName}\", the application will now exit."
+msgid ""
+"Unable to connect to account \"{accountName}\", the application will now "
+"exit."
 msgstr ""
 
-#: ayatanawebmail/application.py:1136
+#: /ayatanawebmail/application.py:1131
 #, python-format
-msgid "You have %d unread mail"
-msgid_plural "You have %d unread mails"
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ayatanawebmail/application.py:1163
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr ""
 
-#: ayatanawebmail/application.py:1165
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1167
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1180
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:60
-msgid "If this string starts with http:// or https://, the application will open it in your browser - otherwise, it will be run as a command"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:61
+msgid ""
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:90 ayatanawebmail/dialog.py:104
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:132
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:140
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:141
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:142
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:143
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:204
-msgid "Please visit the following link and enable access for less secure apps:"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:206
-msgid "Access blocked by Google"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:210
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:211
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:234
-msgid "Custom"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:242
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:244
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:286
-msgid "The application will append this string to \"Inbox\" to access a specific message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+#: /ayatanawebmail/dialog.py:276
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:288
+#: /ayatanawebmail/dialog.py:278
 msgid "Account:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:290
+#: /ayatanawebmail/dialog.py:280
 msgid "Server:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:292
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:294
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:296
+#: /ayatanawebmail/dialog.py:286
 msgid "Username:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:298
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:300
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:302
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:296
 msgid "Sent:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:308
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:310
+#: /ayatanawebmail/dialog.py:300
 msgid "Message:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:346
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:347
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:348
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:358
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:360
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:362
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:364
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:369
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:376
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:392
+#: /ayatanawebmail/dialog.py:382
 msgid "Report a bug"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:394
+#: /ayatanawebmail/dialog.py:384
 msgid "Request a feature"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:396 ayatanawebmail/dialog.py:399
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
 #, python-brace-format
 msgid "It's a good idea to add the {labelname} label to your issue."
 msgstr ""
 
-#: ayatanawebmail/dialog.py:397
+#: /ayatanawebmail/dialog.py:387
 msgid "Ask a question"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:400
+#: /ayatanawebmail/dialog.py:390
 msgid "Help translate"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:402
+#: /ayatanawebmail/dialog.py:392
 msgid "Source code"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:404
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:424
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+msgid "Enable notifications"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+msgid "Play sound when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+msgid "Hide message count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:5
-msgid "Display notifications about new mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+msgid "Run this command when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+msgid "Custom sound"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:5
-msgid "Webmail notifications and actions for any desktop"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+msgid "Play a custom sound when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:15
-msgid "Mark all as read"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+msgid "Merge messages"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:20
-msgid "Compose Mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+msgid "Merge messages belonging to the same conversation."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:25
-msgid "Sent"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+msgid "Message action"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:30
-msgid "Inbox"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+msgid "Action to perform when a message is activated."
 msgstr ""
diff --git a/po/km.po b/po/km.po
index d9adaaa..e896938 100644
--- a/po/km.po
+++ b/po/km.po
@@ -6,9 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail 22.6.28\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/"
-"issues\n"
-"POT-Creation-Date: 2020-08-22 20:15+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -18,299 +17,328 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr ""
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr ""
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr ""
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:204
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr ""
 
-#: ayatanawebmail/application.py:211
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr ""
 
-#: ayatanawebmail/application.py:218
-#: data/usr/share/applications/ayatana-webmail.desktop:35
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr ""
 
-#: ayatanawebmail/application.py:957
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:1110
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr ""
 
-#: ayatanawebmail/application.py:1111
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
-msgid "Unable to connect to account \"{accountName}\", the application will now exit."
+msgid ""
+"Unable to connect to account \"{accountName}\", the application will now "
+"exit."
 msgstr ""
 
-#: ayatanawebmail/application.py:1136
+#: /ayatanawebmail/application.py:1131
 #, python-format
-msgid "You have %d unread mail"
-msgid_plural "You have %d unread mails"
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
 msgstr[0] ""
 
-#: ayatanawebmail/application.py:1163
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr ""
 
-#: ayatanawebmail/application.py:1165
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1167
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1180
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:60
-msgid "If this string starts with http:// or https://, the application will open it in your browser - otherwise, it will be run as a command"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:61
+msgid ""
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:90 ayatanawebmail/dialog.py:104
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:132
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:140
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:141
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:142
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:143
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:204
-msgid "Please visit the following link and enable access for less secure apps:"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:206
-msgid "Access blocked by Google"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:210
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:211
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:234
-msgid "Custom"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:242
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:244
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:286
-msgid "The application will append this string to \"Inbox\" to access a specific message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+#: /ayatanawebmail/dialog.py:276
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:288
+#: /ayatanawebmail/dialog.py:278
 msgid "Account:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:290
+#: /ayatanawebmail/dialog.py:280
 msgid "Server:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:292
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:294
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:296
+#: /ayatanawebmail/dialog.py:286
 msgid "Username:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:298
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:300
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:302
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:296
 msgid "Sent:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:308
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:310
+#: /ayatanawebmail/dialog.py:300
 msgid "Message:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:346
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:347
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:348
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:358
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:360
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:362
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:364
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:369
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:376
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:392
+#: /ayatanawebmail/dialog.py:382
 msgid "Report a bug"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:394
+#: /ayatanawebmail/dialog.py:384
 msgid "Request a feature"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:396 ayatanawebmail/dialog.py:399
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
 #, python-brace-format
 msgid "It's a good idea to add the {labelname} label to your issue."
 msgstr ""
 
-#: ayatanawebmail/dialog.py:397
+#: /ayatanawebmail/dialog.py:387
 msgid "Ask a question"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:400
+#: /ayatanawebmail/dialog.py:390
 msgid "Help translate"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:402
+#: /ayatanawebmail/dialog.py:392
 msgid "Source code"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:404
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:424
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+msgid "Enable notifications"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+msgid "Play sound when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+msgid "Hide message count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:5
-msgid "Display notifications about new mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+msgid "Run this command when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+msgid "Custom sound"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:5
-msgid "Webmail notifications and actions for any desktop"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+msgid "Play a custom sound when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:15
-msgid "Mark all as read"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+msgid "Merge messages"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:20
-msgid "Compose Mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+msgid "Merge messages belonging to the same conversation."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:25
-msgid "Sent"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+msgid "Message action"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:30
-msgid "Inbox"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+msgid "Action to perform when a message is activated."
 msgstr ""
diff --git a/po/kmr.po b/po/kmr.po
index 37a5429..b7c68dd 100644
--- a/po/kmr.po
+++ b/po/kmr.po
@@ -6,9 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail 22.6.28\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/"
-"issues\n"
-"POT-Creation-Date: 2021-01-03 14:41+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -18,300 +17,329 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr ""
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr ""
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr ""
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:204
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr ""
 
-#: ayatanawebmail/application.py:211
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr ""
 
-#: ayatanawebmail/application.py:218
-#: data/usr/share/applications/ayatana-webmail.desktop:35
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr ""
 
-#: ayatanawebmail/application.py:957
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:1110
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr ""
 
-#: ayatanawebmail/application.py:1111
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
-msgid "Unable to connect to account \"{accountName}\", the application will now exit."
+msgid ""
+"Unable to connect to account \"{accountName}\", the application will now "
+"exit."
 msgstr ""
 
-#: ayatanawebmail/application.py:1136
+#: /ayatanawebmail/application.py:1131
 #, python-format
 msgid "You have %d unread message"
 msgid_plural "You have %d unread messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ayatanawebmail/application.py:1163
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr ""
 
-#: ayatanawebmail/application.py:1165
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1167
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1180
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:60
-msgid "If this string starts with http:// or https://, the application will open it in your browser - otherwise, it will be run as a command"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:61
+msgid ""
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:90 ayatanawebmail/dialog.py:104
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:132
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:140
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:141
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:142
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:143
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:204
-msgid "Please visit the following link and enable access for less secure apps:"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:206
-msgid "Access blocked by Google"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:210
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:211
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:234
-msgid "Custom"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:242
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:244
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:286
-msgid "The application will append this string to \"Inbox\" to access a specific message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+#: /ayatanawebmail/dialog.py:276
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:288
+#: /ayatanawebmail/dialog.py:278
 msgid "Account:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:290
+#: /ayatanawebmail/dialog.py:280
 msgid "Server:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:292
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:294
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:296
+#: /ayatanawebmail/dialog.py:286
 msgid "Username:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:298
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:300
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:302
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:296
 msgid "Sent:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:308
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:310
+#: /ayatanawebmail/dialog.py:300
 msgid "Message:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:346
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:347
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:348
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:358
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:360
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:362
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:364
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:369
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:376
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:392
+#: /ayatanawebmail/dialog.py:382
 msgid "Report a bug"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:394
+#: /ayatanawebmail/dialog.py:384
 msgid "Request a feature"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:396 ayatanawebmail/dialog.py:399
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
 #, python-brace-format
 msgid "It's a good idea to add the {labelname} label to your issue."
 msgstr ""
 
-#: ayatanawebmail/dialog.py:397
+#: /ayatanawebmail/dialog.py:387
 msgid "Ask a question"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:400
+#: /ayatanawebmail/dialog.py:390
 msgid "Help translate"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:402
+#: /ayatanawebmail/dialog.py:392
 msgid "Source code"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:404
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:424
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+msgid "Enable notifications"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+msgid "Play sound when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+msgid "Hide message count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:5
-msgid "Display notifications about new mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+msgid "Run this command when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+msgid "Custom sound"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:5
-msgid "Webmail notifications and actions for any desktop"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+msgid "Play a custom sound when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:15
-msgid "Mark all as read"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+msgid "Merge messages"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:20
-msgid "Compose Mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+msgid "Merge messages belonging to the same conversation."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:25
-msgid "Sent"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+msgid "Message action"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:30
-msgid "Inbox"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+msgid "Action to perform when a message is activated."
 msgstr ""
diff --git a/po/kn.po b/po/kn.po
index fa8979d..f42532c 100644
--- a/po/kn.po
+++ b/po/kn.po
@@ -6,9 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail 22.6.28\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/"
-"issues\n"
-"POT-Creation-Date: 2020-08-22 20:15+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -18,300 +17,329 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr ""
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr ""
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr ""
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:204
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr ""
 
-#: ayatanawebmail/application.py:211
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr ""
 
-#: ayatanawebmail/application.py:218
-#: data/usr/share/applications/ayatana-webmail.desktop:35
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr ""
 
-#: ayatanawebmail/application.py:957
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:1110
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr ""
 
-#: ayatanawebmail/application.py:1111
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
-msgid "Unable to connect to account \"{accountName}\", the application will now exit."
+msgid ""
+"Unable to connect to account \"{accountName}\", the application will now "
+"exit."
 msgstr ""
 
-#: ayatanawebmail/application.py:1136
+#: /ayatanawebmail/application.py:1131
 #, python-format
-msgid "You have %d unread mail"
-msgid_plural "You have %d unread mails"
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ayatanawebmail/application.py:1163
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr ""
 
-#: ayatanawebmail/application.py:1165
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1167
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1180
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:60
-msgid "If this string starts with http:// or https://, the application will open it in your browser - otherwise, it will be run as a command"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:61
+msgid ""
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:90 ayatanawebmail/dialog.py:104
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:132
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:140
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:141
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:142
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:143
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:204
-msgid "Please visit the following link and enable access for less secure apps:"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:206
-msgid "Access blocked by Google"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:210
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:211
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:234
-msgid "Custom"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:242
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:244
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:286
-msgid "The application will append this string to \"Inbox\" to access a specific message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+#: /ayatanawebmail/dialog.py:276
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:288
+#: /ayatanawebmail/dialog.py:278
 msgid "Account:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:290
+#: /ayatanawebmail/dialog.py:280
 msgid "Server:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:292
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:294
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:296
+#: /ayatanawebmail/dialog.py:286
 msgid "Username:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:298
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:300
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:302
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:296
 msgid "Sent:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:308
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:310
+#: /ayatanawebmail/dialog.py:300
 msgid "Message:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:346
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:347
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:348
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:358
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:360
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:362
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:364
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:369
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:376
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:392
+#: /ayatanawebmail/dialog.py:382
 msgid "Report a bug"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:394
+#: /ayatanawebmail/dialog.py:384
 msgid "Request a feature"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:396 ayatanawebmail/dialog.py:399
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
 #, python-brace-format
 msgid "It's a good idea to add the {labelname} label to your issue."
 msgstr ""
 
-#: ayatanawebmail/dialog.py:397
+#: /ayatanawebmail/dialog.py:387
 msgid "Ask a question"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:400
+#: /ayatanawebmail/dialog.py:390
 msgid "Help translate"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:402
+#: /ayatanawebmail/dialog.py:392
 msgid "Source code"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:404
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:424
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+msgid "Enable notifications"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+msgid "Play sound when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+msgid "Hide message count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:5
-msgid "Display notifications about new mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+msgid "Run this command when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+msgid "Custom sound"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:5
-msgid "Webmail notifications and actions for any desktop"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+msgid "Play a custom sound when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:15
-msgid "Mark all as read"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+msgid "Merge messages"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:20
-msgid "Compose Mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+msgid "Merge messages belonging to the same conversation."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:25
-msgid "Sent"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+msgid "Message action"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:30
-msgid "Inbox"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+msgid "Action to perform when a message is activated."
 msgstr ""
diff --git a/po/ko.po b/po/ko.po
index f0938fe..12801a1 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -6,13 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail 22.6.28\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/"
-"issues\n"
-"POT-Creation-Date: 2020-08-22 20:15+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: 2022-03-16 13:58+0000\n"
 "Last-Translator: 이정희 <daemul72@gmail.com>\n"
-"Language-Team: Korean <https://hosted.weblate.org/projects/"
-"ayatana-indicators/ayatana-webmail/ko/>\n"
+"Language-Team: Korean <https://hosted.weblate.org/projects/ayatana-"
+"indicators/ayatana-webmail/ko/>\n"
 "Language: ko\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,303 +19,375 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Weblate 4.12-dev\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr "계정 선택"
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr "어떤 계정의 명령/웹 페이지를 열고 싶습니까?"
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr "메시지 작업"
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr "삭제"
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr "읽은 것으로 표시"
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr "메시지 열기/명령 실행"
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr "보낸 사람"
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr "제목"
 
-#: ayatanawebmail/application.py:204
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr "웹메일 홈페이지 열기"
 
-#: ayatanawebmail/application.py:211
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr "지우기"
 
-#: ayatanawebmail/application.py:218
-#: data/usr/share/applications/ayatana-webmail.desktop:35
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr "설정"
 
-#: ayatanawebmail/application.py:957
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr "제목 없음"
 
-#: ayatanawebmail/application.py:1110
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr "연결 오류"
 
-#: ayatanawebmail/application.py:1111
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
-msgid "Unable to connect to account \"{accountName}\", the application will now exit."
-msgstr "\"{accountName}\" 계정에 연결할 수 없습니다. 이제 응용프로그램이 종료됩니다."
+msgid ""
+"Unable to connect to account \"{accountName}\", the application will now "
+"exit."
+msgstr ""
+"\"{accountName}\" 계정에 연결할 수 없습니다. 이제 응용프로그램이 종료됩니다."
 
-#: ayatanawebmail/application.py:1136
-#, python-format
-msgid "You have %d unread mail"
-msgid_plural "You have %d unread mails"
+#: /ayatanawebmail/application.py:1131
+#, fuzzy, python-format
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
 msgstr[0] "읽지 않은 메일이 %d개 있습니다"
 
-#: ayatanawebmail/application.py:1163
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr "%(t0)s, %(t1)s 및 기타에서"
 
-#: ayatanawebmail/application.py:1165
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr "%(t0)s 및 %(t1)s에서"
 
-#: ayatanawebmail/application.py:1167
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr "%s에서"
 
-#: ayatanawebmail/application.py:1180
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr "%s의 새 메일"
 
-#: ayatanawebmail/dialog.py:60
-msgid "If this string starts with http:// or https://, the application will open it in your browser - otherwise, it will be run as a command"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
+msgstr "사용자 지정"
+
+#: /ayatanawebmail/dialog.py:61
+msgid ""
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
-"이 문자열이 http:// 또는 https://로 시작하면 응용 프로그램이 브라우저에서 "
-"해당 문자열을 엽니다. 그렇지 않으면 명령으로 실행됩니다"
+"이 문자열이 http:// 또는 https://로 시작하면 응용 프로그램이 브라우저에서 해"
+"당 문자열을 엽니다. 그렇지 않으면 명령으로 실행됩니다"
 
-#: ayatanawebmail/dialog.py:90 ayatanawebmail/dialog.py:104
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr "(없음)"
 
-#: ayatanawebmail/dialog.py:132
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr "Ayatana 웹메일 기본설정"
 
-#: ayatanawebmail/dialog.py:140
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr "계정"
 
-#: ayatanawebmail/dialog.py:141
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr "옵션"
 
-#: ayatanawebmail/dialog.py:142
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr "지원"
 
-#: ayatanawebmail/dialog.py:143
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr "정보"
 
-#: ayatanawebmail/dialog.py:204
-msgid "Please visit the following link and enable access for less secure apps:"
-msgstr "다음 링크를 방문하여 보안 수준이 낮은 앱에 대한 액세스를 활성화하십시오:"
-
-#: ayatanawebmail/dialog.py:206
-msgid "Access blocked by Google"
-msgstr "Google에 의해 액세스가 차단됨"
-
-#: ayatanawebmail/dialog.py:210
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr "메일 계정에 연결하지 못했습니다. 반환된 오류는 다음과 같습니다:"
 
-#: ayatanawebmail/dialog.py:211
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr "연결에 실패했습니다"
 
-#: ayatanawebmail/dialog.py:234
-msgid "Custom"
-msgstr "사용자 지정"
-
-#: ayatanawebmail/dialog.py:242
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr "추가"
 
-#: ayatanawebmail/dialog.py:244
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr "제거"
 
-#: ayatanawebmail/dialog.py:286
-msgid "The application will append this string to \"Inbox\" to access a specific message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+#: /ayatanawebmail/dialog.py:276
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
 msgstr ""
-"응용프로그램은 이 문자열을 \"받은 편지함\"에 추가하여 특정 메시지에 "
-"액세스합니다. $MSG_THREAD 및 $MSG_UID 자리 표시자를 사용할 수 있습니다"
+"응용프로그램은 이 문자열을 \"받은 편지함\"에 추가하여 특정 메시지에 액세스합"
+"니다. $MSG_THREAD 및 $MSG_UID 자리 표시자를 사용할 수 있습니다"
 
-#: ayatanawebmail/dialog.py:288
+#: /ayatanawebmail/dialog.py:278
 msgid "Account:"
 msgstr "계정:"
 
-#: ayatanawebmail/dialog.py:290
+#: /ayatanawebmail/dialog.py:280
 msgid "Server:"
 msgstr "서버:"
 
-#: ayatanawebmail/dialog.py:292
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr "호스트:"
 
-#: ayatanawebmail/dialog.py:294
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr "포트:"
 
-#: ayatanawebmail/dialog.py:296
+#: /ayatanawebmail/dialog.py:286
 msgid "Username:"
 msgstr "사용자이름:"
 
-#: ayatanawebmail/dialog.py:298
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr "비밀번호:"
 
-#: ayatanawebmail/dialog.py:300
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr "폴더:"
 
-#: ayatanawebmail/dialog.py:302
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr "홈:"
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr "작성:"
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:296
 msgid "Sent:"
 msgstr "전송됨:"
 
-#: ayatanawebmail/dialog.py:308
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr "받은 편지함:"
 
-#: ayatanawebmail/dialog.py:310
+#: /ayatanawebmail/dialog.py:300
 msgid "Message:"
 msgstr "메세지:"
 
-#: ayatanawebmail/dialog.py:346
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr "메시지를 읽은 것으로 표시"
 
-#: ayatanawebmail/dialog.py:347
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr "브라우저에서 메시지 열기/명령 실행"
 
-#: ayatanawebmail/dialog.py:348
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr "어떻게 할지 묻기"
 
-#: ayatanawebmail/dialog.py:358
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr "알림 활성화:"
 
-#: ayatanawebmail/dialog.py:360
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr "메시지 수신 시 사운드 재생:"
 
-#: ayatanawebmail/dialog.py:362
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr "동일한 대화의 메시지 병합:"
 
-#: ayatanawebmail/dialog.py:364
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr "0일 때 카운트 숨김:"
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr "메시지가 활성화되면:"
 
-#: ayatanawebmail/dialog.py:369
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr "메시지가 수신되면 다음 명령 실행:"
 
-#: ayatanawebmail/dialog.py:376
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr "재생할 사용자 지정 사운드:"
 
-#: ayatanawebmail/dialog.py:392
+#: /ayatanawebmail/dialog.py:382
 msgid "Report a bug"
 msgstr "버그 신고"
 
-#: ayatanawebmail/dialog.py:394
+#: /ayatanawebmail/dialog.py:384
 msgid "Request a feature"
 msgstr "기능 요청"
 
-#: ayatanawebmail/dialog.py:396 ayatanawebmail/dialog.py:399
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
 #, python-brace-format
 msgid "It's a good idea to add the {labelname} label to your issue."
 msgstr "이슈에 {labelname} 레이블을 추가하는 것이 좋습니다."
 
-#: ayatanawebmail/dialog.py:397
+#: /ayatanawebmail/dialog.py:387
 msgid "Ask a question"
 msgstr "질문하기"
 
-#: ayatanawebmail/dialog.py:400
+#: /ayatanawebmail/dialog.py:390
 msgid "Help translate"
 msgstr "도움말 번역"
 
-#: ayatanawebmail/dialog.py:402
+#: /ayatanawebmail/dialog.py:392
 msgid "Source code"
 msgstr "소스 코드"
 
-#: ayatanawebmail/dialog.py:404
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr "홈 페이지"
 
-#: ayatanawebmail/dialog.py:424
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr "이정희 <daemul72@gmail.com>"
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
-msgstr "Ayatana 웹메일 (서비스)"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+#, fuzzy
+msgid "Enable notifications"
+msgstr "알림 활성화:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+#, fuzzy
+msgid "Play sound when new messages arrive."
+msgstr "메시지 수신 시 사운드 재생:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+#, fuzzy
+msgid "Hide message count"
+msgstr "메시지 열기/명령 실행"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+#, fuzzy
+msgid "Run this command when new messages arrive."
+msgstr "메시지가 수신되면 다음 명령 실행:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+#, fuzzy
+msgid "Custom sound"
+msgstr "재생할 사용자 지정 사운드:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+#, fuzzy
+msgid "Play a custom sound when new messages arrive."
+msgstr "메시지 수신 시 사운드 재생:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+#, fuzzy
+msgid "Merge messages"
+msgstr "메시지를 읽은 것으로 표시"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+#, fuzzy
+msgid "Merge messages belonging to the same conversation."
+msgstr "동일한 대화의 메시지 병합:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+#, fuzzy
+msgid "Message action"
+msgstr "메시지 작업"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+#, fuzzy
+msgid "Action to perform when a message is activated."
+msgstr "메시지가 활성화되면:"
+
+#~ msgid ""
+#~ "Please visit the following link and enable access for less secure apps:"
+#~ msgstr ""
+#~ "다음 링크를 방문하여 보안 수준이 낮은 앱에 대한 액세스를 활성화하십시오:"
+
+#~ msgid "Access blocked by Google"
+#~ msgstr "Google에 의해 액세스가 차단됨"
+
+#~ msgid "Ayatana Webmail (service)"
+#~ msgstr "Ayatana 웹메일 (서비스)"
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:5
-msgid "Display notifications about new mail"
-msgstr "새 메일에 대한 알림 표시"
+#~ msgid "Display notifications about new mail"
+#~ msgstr "새 메일에 대한 알림 표시"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
-msgstr "Ayatana 웹메일"
+#~ msgid "Ayatana Webmail"
+#~ msgstr "Ayatana 웹메일"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:5
-msgid "Webmail notifications and actions for any desktop"
-msgstr "모든 데스크톱에 대한 웹 메일 알림 및 작업"
+#~ msgid "Webmail notifications and actions for any desktop"
+#~ msgstr "모든 데스크톱에 대한 웹 메일 알림 및 작업"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:15
-msgid "Mark all as read"
-msgstr "모두 읽은 것으로 표시"
+#~ msgid "Mark all as read"
+#~ msgstr "모두 읽은 것으로 표시"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:20
-msgid "Compose Mail"
-msgstr "메일 작성"
+#~ msgid "Compose Mail"
+#~ msgstr "메일 작성"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:25
-msgid "Sent"
-msgstr "전송됨"
+#~ msgid "Sent"
+#~ msgstr "전송됨"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:30
-msgid "Inbox"
-msgstr "받은 편지함"
+#~ msgid "Inbox"
+#~ msgstr "받은 편지함"
diff --git a/po/kw.po b/po/kw.po
index 567bb2d..4c6f077 100644
--- a/po/kw.po
+++ b/po/kw.po
@@ -6,9 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail 22.6.28\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/"
-"issues\n"
-"POT-Creation-Date: 2020-08-22 20:15+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -24,68 +23,69 @@ msgstr ""
 "n % 100 == 63 || n % 100 == 83) ? 3 : ((n != 1 && (n % 100 == 1 || n % 100 "
 "== 21 || n % 100 == 41 || n % 100 == 61 || n % 100 == 81)) ? 4 : 5))));\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr ""
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr ""
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr ""
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:204
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr ""
 
-#: ayatanawebmail/application.py:211
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr ""
 
-#: ayatanawebmail/application.py:218
-#: data/usr/share/applications/ayatana-webmail.desktop:35
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr ""
 
-#: ayatanawebmail/application.py:957
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:1110
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr ""
 
-#: ayatanawebmail/application.py:1111
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
-msgid "Unable to connect to account \"{accountName}\", the application will now exit."
+msgid ""
+"Unable to connect to account \"{accountName}\", the application will now "
+"exit."
 msgstr ""
 
-#: ayatanawebmail/application.py:1136
+#: /ayatanawebmail/application.py:1131
 #, python-format
-msgid "You have %d unread mail"
-msgid_plural "You have %d unread mails"
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
@@ -93,235 +93,263 @@ msgstr[3] ""
 msgstr[4] ""
 msgstr[5] ""
 
-#: ayatanawebmail/application.py:1163
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr ""
 
-#: ayatanawebmail/application.py:1165
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1167
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1180
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:60
-msgid "If this string starts with http:// or https://, the application will open it in your browser - otherwise, it will be run as a command"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:61
+msgid ""
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:90 ayatanawebmail/dialog.py:104
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:132
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:140
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:141
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:142
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:143
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:204
-msgid "Please visit the following link and enable access for less secure apps:"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:206
-msgid "Access blocked by Google"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:210
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:211
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:234
-msgid "Custom"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:242
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:244
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:286
-msgid "The application will append this string to \"Inbox\" to access a specific message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+#: /ayatanawebmail/dialog.py:276
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:288
+#: /ayatanawebmail/dialog.py:278
 msgid "Account:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:290
+#: /ayatanawebmail/dialog.py:280
 msgid "Server:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:292
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:294
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:296
+#: /ayatanawebmail/dialog.py:286
 msgid "Username:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:298
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:300
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:302
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:296
 msgid "Sent:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:308
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:310
+#: /ayatanawebmail/dialog.py:300
 msgid "Message:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:346
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:347
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:348
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:358
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:360
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:362
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:364
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:369
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:376
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:392
+#: /ayatanawebmail/dialog.py:382
 msgid "Report a bug"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:394
+#: /ayatanawebmail/dialog.py:384
 msgid "Request a feature"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:396 ayatanawebmail/dialog.py:399
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
 #, python-brace-format
 msgid "It's a good idea to add the {labelname} label to your issue."
 msgstr ""
 
-#: ayatanawebmail/dialog.py:397
+#: /ayatanawebmail/dialog.py:387
 msgid "Ask a question"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:400
+#: /ayatanawebmail/dialog.py:390
 msgid "Help translate"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:402
+#: /ayatanawebmail/dialog.py:392
 msgid "Source code"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:404
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:424
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+msgid "Enable notifications"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+msgid "Play sound when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+msgid "Hide message count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:5
-msgid "Display notifications about new mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+msgid "Run this command when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+msgid "Custom sound"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:5
-msgid "Webmail notifications and actions for any desktop"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+msgid "Play a custom sound when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:15
-msgid "Mark all as read"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+msgid "Merge messages"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:20
-msgid "Compose Mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+msgid "Merge messages belonging to the same conversation."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:25
-msgid "Sent"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+msgid "Message action"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:30
-msgid "Inbox"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+msgid "Action to perform when a message is activated."
 msgstr ""
diff --git a/po/ky.po b/po/ky.po
index 551b871..1446ec9 100644
--- a/po/ky.po
+++ b/po/ky.po
@@ -6,9 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail 22.6.28\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/"
-"issues\n"
-"POT-Creation-Date: 2020-08-22 20:15+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -18,300 +17,329 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr ""
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr ""
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr ""
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:204
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr ""
 
-#: ayatanawebmail/application.py:211
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr ""
 
-#: ayatanawebmail/application.py:218
-#: data/usr/share/applications/ayatana-webmail.desktop:35
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr ""
 
-#: ayatanawebmail/application.py:957
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:1110
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr ""
 
-#: ayatanawebmail/application.py:1111
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
-msgid "Unable to connect to account \"{accountName}\", the application will now exit."
+msgid ""
+"Unable to connect to account \"{accountName}\", the application will now "
+"exit."
 msgstr ""
 
-#: ayatanawebmail/application.py:1136
+#: /ayatanawebmail/application.py:1131
 #, python-format
-msgid "You have %d unread mail"
-msgid_plural "You have %d unread mails"
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ayatanawebmail/application.py:1163
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr ""
 
-#: ayatanawebmail/application.py:1165
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1167
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1180
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:60
-msgid "If this string starts with http:// or https://, the application will open it in your browser - otherwise, it will be run as a command"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:61
+msgid ""
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:90 ayatanawebmail/dialog.py:104
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:132
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:140
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:141
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:142
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:143
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:204
-msgid "Please visit the following link and enable access for less secure apps:"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:206
-msgid "Access blocked by Google"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:210
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:211
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:234
-msgid "Custom"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:242
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:244
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:286
-msgid "The application will append this string to \"Inbox\" to access a specific message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+#: /ayatanawebmail/dialog.py:276
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:288
+#: /ayatanawebmail/dialog.py:278
 msgid "Account:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:290
+#: /ayatanawebmail/dialog.py:280
 msgid "Server:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:292
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:294
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:296
+#: /ayatanawebmail/dialog.py:286
 msgid "Username:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:298
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:300
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:302
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:296
 msgid "Sent:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:308
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:310
+#: /ayatanawebmail/dialog.py:300
 msgid "Message:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:346
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:347
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:348
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:358
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:360
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:362
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:364
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:369
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:376
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:392
+#: /ayatanawebmail/dialog.py:382
 msgid "Report a bug"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:394
+#: /ayatanawebmail/dialog.py:384
 msgid "Request a feature"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:396 ayatanawebmail/dialog.py:399
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
 #, python-brace-format
 msgid "It's a good idea to add the {labelname} label to your issue."
 msgstr ""
 
-#: ayatanawebmail/dialog.py:397
+#: /ayatanawebmail/dialog.py:387
 msgid "Ask a question"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:400
+#: /ayatanawebmail/dialog.py:390
 msgid "Help translate"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:402
+#: /ayatanawebmail/dialog.py:392
 msgid "Source code"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:404
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:424
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+msgid "Enable notifications"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+msgid "Play sound when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+msgid "Hide message count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:5
-msgid "Display notifications about new mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+msgid "Run this command when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+msgid "Custom sound"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:5
-msgid "Webmail notifications and actions for any desktop"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+msgid "Play a custom sound when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:15
-msgid "Mark all as read"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+msgid "Merge messages"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:20
-msgid "Compose Mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+msgid "Merge messages belonging to the same conversation."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:25
-msgid "Sent"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+msgid "Message action"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:30
-msgid "Inbox"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+msgid "Action to perform when a message is activated."
 msgstr ""
diff --git a/po/la.po b/po/la.po
index 8cfd2e6..3129748 100644
--- a/po/la.po
+++ b/po/la.po
@@ -6,9 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail 22.6.28\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/"
-"issues\n"
-"POT-Creation-Date: 2020-08-22 20:15+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -18,300 +17,329 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr ""
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr ""
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr ""
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:204
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr ""
 
-#: ayatanawebmail/application.py:211
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr ""
 
-#: ayatanawebmail/application.py:218
-#: data/usr/share/applications/ayatana-webmail.desktop:35
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr ""
 
-#: ayatanawebmail/application.py:957
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:1110
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr ""
 
-#: ayatanawebmail/application.py:1111
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
-msgid "Unable to connect to account \"{accountName}\", the application will now exit."
+msgid ""
+"Unable to connect to account \"{accountName}\", the application will now "
+"exit."
 msgstr ""
 
-#: ayatanawebmail/application.py:1136
+#: /ayatanawebmail/application.py:1131
 #, python-format
-msgid "You have %d unread mail"
-msgid_plural "You have %d unread mails"
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ayatanawebmail/application.py:1163
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr ""
 
-#: ayatanawebmail/application.py:1165
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1167
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1180
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:60
-msgid "If this string starts with http:// or https://, the application will open it in your browser - otherwise, it will be run as a command"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:61
+msgid ""
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:90 ayatanawebmail/dialog.py:104
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:132
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:140
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:141
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:142
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:143
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:204
-msgid "Please visit the following link and enable access for less secure apps:"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:206
-msgid "Access blocked by Google"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:210
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:211
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:234
-msgid "Custom"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:242
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:244
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:286
-msgid "The application will append this string to \"Inbox\" to access a specific message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+#: /ayatanawebmail/dialog.py:276
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:288
+#: /ayatanawebmail/dialog.py:278
 msgid "Account:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:290
+#: /ayatanawebmail/dialog.py:280
 msgid "Server:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:292
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:294
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:296
+#: /ayatanawebmail/dialog.py:286
 msgid "Username:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:298
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:300
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:302
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:296
 msgid "Sent:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:308
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:310
+#: /ayatanawebmail/dialog.py:300
 msgid "Message:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:346
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:347
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:348
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:358
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:360
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:362
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:364
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:369
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:376
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:392
+#: /ayatanawebmail/dialog.py:382
 msgid "Report a bug"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:394
+#: /ayatanawebmail/dialog.py:384
 msgid "Request a feature"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:396 ayatanawebmail/dialog.py:399
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
 #, python-brace-format
 msgid "It's a good idea to add the {labelname} label to your issue."
 msgstr ""
 
-#: ayatanawebmail/dialog.py:397
+#: /ayatanawebmail/dialog.py:387
 msgid "Ask a question"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:400
+#: /ayatanawebmail/dialog.py:390
 msgid "Help translate"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:402
+#: /ayatanawebmail/dialog.py:392
 msgid "Source code"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:404
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:424
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+msgid "Enable notifications"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+msgid "Play sound when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+msgid "Hide message count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:5
-msgid "Display notifications about new mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+msgid "Run this command when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+msgid "Custom sound"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:5
-msgid "Webmail notifications and actions for any desktop"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+msgid "Play a custom sound when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:15
-msgid "Mark all as read"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+msgid "Merge messages"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:20
-msgid "Compose Mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+msgid "Merge messages belonging to the same conversation."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:25
-msgid "Sent"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+msgid "Message action"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:30
-msgid "Inbox"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+msgid "Action to perform when a message is activated."
 msgstr ""
diff --git a/po/lb.po b/po/lb.po
index 4842fea..be81325 100644
--- a/po/lb.po
+++ b/po/lb.po
@@ -6,9 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail 22.6.28\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/"
-"issues\n"
-"POT-Creation-Date: 2020-08-22 20:15+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -18,300 +17,329 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr ""
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr ""
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr ""
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:204
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr ""
 
-#: ayatanawebmail/application.py:211
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr ""
 
-#: ayatanawebmail/application.py:218
-#: data/usr/share/applications/ayatana-webmail.desktop:35
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr ""
 
-#: ayatanawebmail/application.py:957
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:1110
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr ""
 
-#: ayatanawebmail/application.py:1111
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
-msgid "Unable to connect to account \"{accountName}\", the application will now exit."
+msgid ""
+"Unable to connect to account \"{accountName}\", the application will now "
+"exit."
 msgstr ""
 
-#: ayatanawebmail/application.py:1136
+#: /ayatanawebmail/application.py:1131
 #, python-format
-msgid "You have %d unread mail"
-msgid_plural "You have %d unread mails"
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ayatanawebmail/application.py:1163
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr ""
 
-#: ayatanawebmail/application.py:1165
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1167
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1180
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:60
-msgid "If this string starts with http:// or https://, the application will open it in your browser - otherwise, it will be run as a command"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:61
+msgid ""
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:90 ayatanawebmail/dialog.py:104
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:132
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:140
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:141
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:142
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:143
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:204
-msgid "Please visit the following link and enable access for less secure apps:"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:206
-msgid "Access blocked by Google"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:210
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:211
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:234
-msgid "Custom"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:242
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:244
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:286
-msgid "The application will append this string to \"Inbox\" to access a specific message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+#: /ayatanawebmail/dialog.py:276
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:288
+#: /ayatanawebmail/dialog.py:278
 msgid "Account:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:290
+#: /ayatanawebmail/dialog.py:280
 msgid "Server:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:292
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:294
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:296
+#: /ayatanawebmail/dialog.py:286
 msgid "Username:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:298
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:300
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:302
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:296
 msgid "Sent:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:308
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:310
+#: /ayatanawebmail/dialog.py:300
 msgid "Message:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:346
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:347
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:348
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:358
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:360
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:362
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:364
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:369
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:376
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:392
+#: /ayatanawebmail/dialog.py:382
 msgid "Report a bug"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:394
+#: /ayatanawebmail/dialog.py:384
 msgid "Request a feature"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:396 ayatanawebmail/dialog.py:399
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
 #, python-brace-format
 msgid "It's a good idea to add the {labelname} label to your issue."
 msgstr ""
 
-#: ayatanawebmail/dialog.py:397
+#: /ayatanawebmail/dialog.py:387
 msgid "Ask a question"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:400
+#: /ayatanawebmail/dialog.py:390
 msgid "Help translate"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:402
+#: /ayatanawebmail/dialog.py:392
 msgid "Source code"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:404
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:424
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+msgid "Enable notifications"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+msgid "Play sound when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+msgid "Hide message count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:5
-msgid "Display notifications about new mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+msgid "Run this command when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+msgid "Custom sound"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:5
-msgid "Webmail notifications and actions for any desktop"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+msgid "Play a custom sound when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:15
-msgid "Mark all as read"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+msgid "Merge messages"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:20
-msgid "Compose Mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+msgid "Merge messages belonging to the same conversation."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:25
-msgid "Sent"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+msgid "Message action"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:30
-msgid "Inbox"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+msgid "Action to perform when a message is activated."
 msgstr ""
diff --git a/po/lo.po b/po/lo.po
index 149a2a5..08e0c8b 100644
--- a/po/lo.po
+++ b/po/lo.po
@@ -6,9 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail 22.6.28\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/"
-"issues\n"
-"POT-Creation-Date: 2020-08-22 20:15+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -18,299 +17,328 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr ""
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr ""
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr ""
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:204
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr ""
 
-#: ayatanawebmail/application.py:211
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr ""
 
-#: ayatanawebmail/application.py:218
-#: data/usr/share/applications/ayatana-webmail.desktop:35
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr ""
 
-#: ayatanawebmail/application.py:957
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:1110
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr ""
 
-#: ayatanawebmail/application.py:1111
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
-msgid "Unable to connect to account \"{accountName}\", the application will now exit."
+msgid ""
+"Unable to connect to account \"{accountName}\", the application will now "
+"exit."
 msgstr ""
 
-#: ayatanawebmail/application.py:1136
+#: /ayatanawebmail/application.py:1131
 #, python-format
-msgid "You have %d unread mail"
-msgid_plural "You have %d unread mails"
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
 msgstr[0] ""
 
-#: ayatanawebmail/application.py:1163
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr ""
 
-#: ayatanawebmail/application.py:1165
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1167
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1180
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:60
-msgid "If this string starts with http:// or https://, the application will open it in your browser - otherwise, it will be run as a command"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:61
+msgid ""
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:90 ayatanawebmail/dialog.py:104
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:132
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:140
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:141
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:142
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:143
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:204
-msgid "Please visit the following link and enable access for less secure apps:"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:206
-msgid "Access blocked by Google"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:210
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:211
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:234
-msgid "Custom"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:242
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:244
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:286
-msgid "The application will append this string to \"Inbox\" to access a specific message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+#: /ayatanawebmail/dialog.py:276
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:288
+#: /ayatanawebmail/dialog.py:278
 msgid "Account:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:290
+#: /ayatanawebmail/dialog.py:280
 msgid "Server:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:292
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:294
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:296
+#: /ayatanawebmail/dialog.py:286
 msgid "Username:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:298
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:300
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:302
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:296
 msgid "Sent:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:308
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:310
+#: /ayatanawebmail/dialog.py:300
 msgid "Message:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:346
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:347
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:348
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:358
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:360
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:362
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:364
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:369
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:376
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:392
+#: /ayatanawebmail/dialog.py:382
 msgid "Report a bug"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:394
+#: /ayatanawebmail/dialog.py:384
 msgid "Request a feature"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:396 ayatanawebmail/dialog.py:399
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
 #, python-brace-format
 msgid "It's a good idea to add the {labelname} label to your issue."
 msgstr ""
 
-#: ayatanawebmail/dialog.py:397
+#: /ayatanawebmail/dialog.py:387
 msgid "Ask a question"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:400
+#: /ayatanawebmail/dialog.py:390
 msgid "Help translate"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:402
+#: /ayatanawebmail/dialog.py:392
 msgid "Source code"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:404
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:424
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+msgid "Enable notifications"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+msgid "Play sound when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+msgid "Hide message count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:5
-msgid "Display notifications about new mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+msgid "Run this command when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+msgid "Custom sound"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:5
-msgid "Webmail notifications and actions for any desktop"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+msgid "Play a custom sound when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:15
-msgid "Mark all as read"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+msgid "Merge messages"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:20
-msgid "Compose Mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+msgid "Merge messages belonging to the same conversation."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:25
-msgid "Sent"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+msgid "Message action"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:30
-msgid "Inbox"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+msgid "Action to perform when a message is activated."
 msgstr ""
diff --git a/po/lt.po b/po/lt.po
index 0c7f30d..fd9b87f 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -6,13 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/"
-"issues\n"
-"POT-Creation-Date: 2020-04-03 12:21+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: 2021-08-08 18:33+0000\n"
 "Last-Translator: Gediminas Murauskas <muziejusinfo@gmail.com>\n"
-"Language-Team: Lithuanian <https://hosted.weblate.org/projects/"
-"ayatana-indicators/ayatana-webmail/lt/>\n"
+"Language-Team: Lithuanian <https://hosted.weblate.org/projects/ayatana-"
+"indicators/ayatana-webmail/lt/>\n"
 "Language: lt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,59 +21,59 @@ msgstr ""
 "X-Generator: Weblate 4.8-dev\n"
 "X-Launchpad-Export-Date: 2020-04-04 05:58+0000\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr "Pasirinkite paskyrą"
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr "Kurios paskyros komandą/žiniatinklio puslapį norėtumėte atverti?"
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr "Veiksmai su laišku"
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr "Ištrinti"
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr "Žymėti kaip skaitytą"
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr "Atverti laišką/Vykdyti komandą"
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr "Siuntėjas"
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr "Tema"
 
-#: ayatanawebmail/application.py:205
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr "Atverti pagrindinį žiniatinklio pašto puslapį"
 
-#: ayatanawebmail/application.py:212
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr "Išvalyti"
 
-#: ayatanawebmail/application.py:219
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr "Nustatymai"
 
-#: ayatanawebmail/application.py:980
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr "Be temos"
 
-#: ayatanawebmail/application.py:1132
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr "Ryšio klaida"
 
-#: ayatanawebmail/application.py:1133
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
 msgid ""
 "Unable to connect to account \"{accountName}\", the application will now "
@@ -83,259 +82,351 @@ msgstr ""
 "Nepavyko prisijungti prie paskyros „{accountName}“, dabar programa bus "
 "užverta."
 
-#: ayatanawebmail/application.py:1133
-#, python-brace-format
-msgid "You can run \"{command}\" to delete all your login settings."
-msgstr ""
-"Norėdami ištrinti visus prisijungimo nustatymus, paleiskite komandą "
-"„{command}“."
-
-#: ayatanawebmail/application.py:1158
-#, python-format
-msgid "You have %d unread mail"
-msgid_plural "You have %d unread mails"
+#: /ayatanawebmail/application.py:1131
+#, fuzzy, python-format
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
 msgstr[0] "Turite %d neskaitytą laišką"
 msgstr[1] "Turite %d neskaitytus laiškus"
 msgstr[2] "Turite %d neskaitytų laiškų"
 
-#: ayatanawebmail/application.py:1185
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr "nuo %(t0)s, %(t1)s ir kitų"
 
-#: ayatanawebmail/application.py:1187
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr "nuo %(t0)s ir %(t1)s"
 
-#: ayatanawebmail/application.py:1189
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr "nuo %s"
 
-#: ayatanawebmail/application.py:1202
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr "Naujas laiškas nuo %s"
 
-#: ayatanawebmail/dialog.py:60
-msgid "Web page"
-msgstr "Internetinis puslapis"
-
-#: ayatanawebmail/dialog.py:61
-msgid "Command"
-msgstr "Komanda"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
+msgstr ""
 
-#: ayatanawebmail/dialog.py:93
+#: /ayatanawebmail/dialog.py:61
 msgid ""
-"Append an additional string - you can use the $MSG_THREAD and $MSG_UID "
-"placeholders."
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
-"Pridėti papildomą eilutę - galite naudoti $MSG_THREAD ir $MSG_UID "
-"vietaženklius."
 
-#: ayatanawebmail/dialog.py:114 ayatanawebmail/dialog.py:128
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr "(Nėra)"
 
-#: ayatanawebmail/dialog.py:156
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr "Ayatana žiniatinklio pašto nuostatos"
 
-#: ayatanawebmail/dialog.py:164
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr "Paskyros"
 
-#: ayatanawebmail/dialog.py:165
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr "Parinktys"
 
-#: ayatanawebmail/dialog.py:166
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr "Palaikymas"
 
-#: ayatanawebmail/dialog.py:167
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr "Apie"
 
-#: ayatanawebmail/dialog.py:228
-msgid ""
-"Please visit the following link and enable access for less secure apps:"
-msgstr ""
-"Apsilankykite šiame tinklalapyje ir įjunkite nelabai saugių programų prieigą:"
-
-#: ayatanawebmail/dialog.py:230
-msgid "Access blocked by Google"
-msgstr "Google užblokavo prieigą"
-
-#: ayatanawebmail/dialog.py:234
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr "Nepavyko prisijungti prie pašto paskyros. Grąžinta klaida buvo:"
 
-#: ayatanawebmail/dialog.py:235
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr "Prisijungimo nesėkmė"
 
-#: ayatanawebmail/dialog.py:254
-msgid "Choose an account"
-msgstr "Pasirinkite paskyrą"
-
-#: ayatanawebmail/dialog.py:259
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr "Pridėti"
 
-#: ayatanawebmail/dialog.py:261
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr "Šalinti"
 
-#: ayatanawebmail/dialog.py:276
-msgid "Server data"
-msgstr "Serverio duomenys"
+#: /ayatanawebmail/dialog.py:276
+#, fuzzy
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+msgstr ""
+"Pridėti papildomą eilutę - galite naudoti $MSG_THREAD ir $MSG_UID "
+"vietaženklius."
 
-#: ayatanawebmail/dialog.py:278
-msgid "Account data"
-msgstr "Paskyros duomenys"
+#: /ayatanawebmail/dialog.py:278
+#, fuzzy
+msgid "Account:"
+msgstr "Paskyros"
 
-#: ayatanawebmail/dialog.py:289
-msgid "Links"
-msgstr "Nuorodos"
+#: /ayatanawebmail/dialog.py:280
+#, fuzzy
+msgid "Server:"
+msgstr "Serverio duomenys"
 
-#: ayatanawebmail/dialog.py:297
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr "Serveris:"
 
-#: ayatanawebmail/dialog.py:299
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr "Prievadas:"
 
-#: ayatanawebmail/dialog.py:302
-msgid "Login:"
-msgstr "Prisijungimo vardas:"
+#: /ayatanawebmail/dialog.py:286
+msgid "Username:"
+msgstr ""
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr "Slaptažodis:"
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr "Aplankai:"
 
-#: ayatanawebmail/dialog.py:309
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr "Pagrindinis:"
 
-#: ayatanawebmail/dialog.py:311
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr "Rašyti:"
 
-#: ayatanawebmail/dialog.py:313
+#: /ayatanawebmail/dialog.py:296
+msgid "Sent:"
+msgstr "Išsiųsta:"
+
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr "Gauta:"
 
-#: ayatanawebmail/dialog.py:316
-msgid "Sent:"
-msgstr "Išsiųsta:"
+#: /ayatanawebmail/dialog.py:300
+#, fuzzy
+msgid "Message:"
+msgstr "Veiksmai su laišku"
 
-#: ayatanawebmail/dialog.py:354
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr "Žymėti laišką kaip skaitytą"
 
-#: ayatanawebmail/dialog.py:355
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr "Atverti laišką naršyklėje/Vykdyti komandą"
 
-#: ayatanawebmail/dialog.py:356
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr "Klausti, ką daryti"
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr "Įjungti pranešimus:"
 
-#: ayatanawebmail/dialog.py:368
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr "Gavus laišką, atkurti garsą:"
 
-#: ayatanawebmail/dialog.py:370
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr "Sulieti el. laiškus iš to paties pokalbio:"
 
-#: ayatanawebmail/dialog.py:372
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr "Slėpti skaičių, kai nulis:"
 
-#: ayatanawebmail/dialog.py:374
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr "Aktyvavus el. laišką:"
 
-#: ayatanawebmail/dialog.py:377
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr "Gavus el. laišką, vykdyti šią komandą:"
 
-#: ayatanawebmail/dialog.py:384
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr "Atkurti šį tinkintą garsą:"
 
-#: ayatanawebmail/dialog.py:400
-msgid "Report a bug/Request a feature"
+#: /ayatanawebmail/dialog.py:382
+msgid "Report a bug"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:384
+#, fuzzy
+msgid "Request a feature"
 msgstr "Pranešti apie klaidą/Prašyti naujos ypatybės"
 
-#: ayatanawebmail/dialog.py:402
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
+#, python-brace-format
+msgid "It's a good idea to add the {labelname} label to your issue."
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:387
 msgid "Ask a question"
 msgstr "Užduoti klausimą"
 
-#: ayatanawebmail/dialog.py:404
+#: /ayatanawebmail/dialog.py:390
 msgid "Help translate"
 msgstr "Padėti versti"
 
-#: ayatanawebmail/dialog.py:406
-msgid "Project page"
-msgstr "Projekto puslapis"
-
-#: ayatanawebmail/dialog.py:408
+#: /ayatanawebmail/dialog.py:392
 msgid "Source code"
 msgstr "Pirminis kodas"
 
-#: ayatanawebmail/dialog.py:410
-msgid "Repository"
-msgstr "Saugykla"
-
-#: ayatanawebmail/dialog.py:412
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr "Pagrindinis puslapis"
 
-#: ayatanawebmail/dialog.py:426
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr "Moo, Enigma, Gediminas Murauskas"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
-msgstr "Ayatana žiniatinklio paštas"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+#, fuzzy
+msgid "Enable notifications"
+msgstr "Įjungti pranešimus:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+#, fuzzy
+msgid "Play sound when new messages arrive."
+msgstr "Gavus laišką, atkurti garsą:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+#, fuzzy
+msgid "Hide message count"
+msgstr "Atverti laišką/Vykdyti komandą"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+#, fuzzy
+msgid "Run this command when new messages arrive."
+msgstr "Gavus el. laišką, vykdyti šią komandą:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+#, fuzzy
+msgid "Custom sound"
+msgstr "Atkurti šį tinkintą garsą:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+#, fuzzy
+msgid "Play a custom sound when new messages arrive."
+msgstr "Gavus laišką, atkurti garsą:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+#, fuzzy
+msgid "Merge messages"
+msgstr "Žymėti laišką kaip skaitytą"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+#, fuzzy
+msgid "Merge messages belonging to the same conversation."
+msgstr "Sulieti el. laiškus iš to paties pokalbio:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+#, fuzzy
+msgid "Message action"
+msgstr "Veiksmai su laišku"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+#, fuzzy
+msgid "Action to perform when a message is activated."
+msgstr "Aktyvavus el. laišką:"
+
+#, python-brace-format
+#~ msgid "You can run \"{command}\" to delete all your login settings."
+#~ msgstr ""
+#~ "Norėdami ištrinti visus prisijungimo nustatymus, paleiskite komandą "
+#~ "„{command}“."
+
+#~ msgid "Web page"
+#~ msgstr "Internetinis puslapis"
+
+#~ msgid "Command"
+#~ msgstr "Komanda"
+
+#~ msgid ""
+#~ "Please visit the following link and enable access for less secure apps:"
+#~ msgstr ""
+#~ "Apsilankykite šiame tinklalapyje ir įjunkite nelabai saugių programų "
+#~ "prieigą:"
+
+#~ msgid "Access blocked by Google"
+#~ msgstr "Google užblokavo prieigą"
+
+#~ msgid "Choose an account"
+#~ msgstr "Pasirinkite paskyrą"
+
+#~ msgid "Account data"
+#~ msgstr "Paskyros duomenys"
+
+#~ msgid "Links"
+#~ msgstr "Nuorodos"
+
+#~ msgid "Login:"
+#~ msgstr "Prisijungimo vardas:"
+
+#~ msgid "Project page"
+#~ msgstr "Projekto puslapis"
+
+#~ msgid "Repository"
+#~ msgstr "Saugykla"
+
+#~ msgid "Ayatana Webmail"
+#~ msgstr "Ayatana žiniatinklio paštas"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:39
-msgid "Webmail notifications and actions for any desktop"
-msgstr "Žiniatinklio pašto pranešimai ir veiksmai bet kuriam darbalaukiui"
+#~ msgid "Webmail notifications and actions for any desktop"
+#~ msgstr "Žiniatinklio pašto pranešimai ir veiksmai bet kuriam darbalaukiui"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:74
-msgid "Mark all as read"
-msgstr "Žymėti visus kaip skaitytus"
+#~ msgid "Mark all as read"
+#~ msgstr "Žymėti visus kaip skaitytus"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:112
-msgid "Compose Mail"
-msgstr "Rašyti laišką"
+#~ msgid "Compose Mail"
+#~ msgstr "Rašyti laišką"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:152
-msgid "Sent"
-msgstr "Išsiųsti laiškai"
+#~ msgid "Sent"
+#~ msgstr "Išsiųsti laiškai"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:228
-msgid "Inbox"
-msgstr "Gauti laiškai"
+#~ msgid "Inbox"
+#~ msgstr "Gauti laiškai"
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
-msgstr "Ayatana žiniatinklio paštas (tarnyba)"
+#~ msgid "Ayatana Webmail (service)"
+#~ msgstr "Ayatana žiniatinklio paštas (tarnyba)"
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:38
-msgid "Display notifications about new mail"
-msgstr "Rodyti pranešimus apie naujus laiškus"
+#~ msgid "Display notifications about new mail"
+#~ msgstr "Rodyti pranešimus apie naujus laiškus"
diff --git a/po/lv.po b/po/lv.po
index dd4549b..015631d 100755
--- a/po/lv.po
+++ b/po/lv.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/issues\n"
-"POT-Creation-Date: 2020-04-03 12:21+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: 2018-06-04 07:34+0000\n"
 "Language-Team: Latvian <lv@li.org>\n"
+"Language: lv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -17,313 +18,358 @@ msgstr ""
 "X-Launchpad-Export-Date: 2020-04-04 05:58+0000\n"
 "X-Generator: Launchpad (build a296f04231dee355be5db73cc878b9e21689a253)\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr ""
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr ""
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr ""
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:205
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr ""
 
-#: ayatanawebmail/application.py:212
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr ""
 
-#: ayatanawebmail/application.py:219
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr ""
 
-#: ayatanawebmail/application.py:980
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr "Bez temata"
 
-#: ayatanawebmail/application.py:1132
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr ""
 
-#: ayatanawebmail/application.py:1133
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
 msgid ""
 "Unable to connect to account \"{accountName}\", the application will now "
 "exit."
 msgstr ""
 
-#: ayatanawebmail/application.py:1133
-#, python-brace-format
-msgid "You can run \"{command}\" to delete all your login settings."
-msgstr ""
-
-#: ayatanawebmail/application.py:1158
-#, python-format
-msgid "You have %d unread mail"
-msgid_plural "You have %d unread mails"
+#: /ayatanawebmail/application.py:1131
+#, fuzzy, python-format
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
 msgstr[0] "Jums ir %d neizlasīta vēstule"
 msgstr[1] "Jums ir %d neizlasītas vēstules"
 msgstr[2] "Jums ir %d neizlasītas vēstules"
 
-#: ayatanawebmail/application.py:1185
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr ""
 
-#: ayatanawebmail/application.py:1187
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1189
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr "no %s"
 
-#: ayatanawebmail/application.py:1202
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr "Jauna vēstule no %s"
 
-#: ayatanawebmail/dialog.py:60
-msgid "Web page"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:61
-msgid "Command"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:93
+#: /ayatanawebmail/dialog.py:61
 msgid ""
-"Append an additional string - you can use the $MSG_THREAD and $MSG_UID "
-"placeholders."
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:114 ayatanawebmail/dialog.py:128
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:156
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr "Ayatana Webmail uzstādījumi"
 
-#: ayatanawebmail/dialog.py:164
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr "Konti"
 
-#: ayatanawebmail/dialog.py:165
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr "Iestatījumi"
 
-#: ayatanawebmail/dialog.py:166
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:167
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:228
-msgid ""
-"Please visit the following link and enable access for less secure apps:"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:230
-msgid "Access blocked by Google"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:234
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:235
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:254
-msgid "Choose an account"
-msgstr "Izvēlieties kontu"
-
-#: ayatanawebmail/dialog.py:259
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:261
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:276
-msgid "Server data"
-msgstr "Servera dati"
+#: /ayatanawebmail/dialog.py:276
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+msgstr ""
 
-#: ayatanawebmail/dialog.py:278
-msgid "Account data"
-msgstr "Konta dati"
+#: /ayatanawebmail/dialog.py:278
+#, fuzzy
+msgid "Account:"
+msgstr "Konti"
 
-#: ayatanawebmail/dialog.py:289
-msgid "Links"
-msgstr ""
+#: /ayatanawebmail/dialog.py:280
+#, fuzzy
+msgid "Server:"
+msgstr "Servera dati"
 
-#: ayatanawebmail/dialog.py:297
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr "Hosts:"
 
-#: ayatanawebmail/dialog.py:299
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr "Ports:"
 
-#: ayatanawebmail/dialog.py:302
-msgid "Login:"
-msgstr "Pieteikšanās vārds:"
+#: /ayatanawebmail/dialog.py:286
+msgid "Username:"
+msgstr ""
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr "Parole:"
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:309
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr "Mājas:"
 
-#: ayatanawebmail/dialog.py:311
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr "Sastādīt:"
 
-#: ayatanawebmail/dialog.py:313
+#: /ayatanawebmail/dialog.py:296
+msgid "Sent:"
+msgstr "Nosūtītās:"
+
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr "Iesūtne:"
 
-#: ayatanawebmail/dialog.py:316
-msgid "Sent:"
-msgstr "Nosūtītās:"
+#: /ayatanawebmail/dialog.py:300
+msgid "Message:"
+msgstr ""
 
-#: ayatanawebmail/dialog.py:354
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:355
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:356
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr "Ieslēgt paziņojumus:"
 
-#: ayatanawebmail/dialog.py:368
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:370
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:372
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:374
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:377
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:384
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr "Pielāgotā skaņa:"
 
-#: ayatanawebmail/dialog.py:400
-msgid "Report a bug/Request a feature"
+#: /ayatanawebmail/dialog.py:382
+msgid "Report a bug"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:402
-msgid "Ask a question"
+#: /ayatanawebmail/dialog.py:384
+msgid "Request a feature"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:404
-msgid "Help translate"
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
+#, python-brace-format
+msgid "It's a good idea to add the {labelname} label to your issue."
 msgstr ""
 
-#: ayatanawebmail/dialog.py:406
-msgid "Project page"
+#: /ayatanawebmail/dialog.py:387
+msgid "Ask a question"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:408
-msgid "Source code"
+#: /ayatanawebmail/dialog.py:390
+msgid "Help translate"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:410
-msgid "Repository"
+#: /ayatanawebmail/dialog.py:392
+msgid "Source code"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:412
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:426
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
-msgstr "Ayatana Pasts"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+#, fuzzy
+msgid "Enable notifications"
+msgstr "Ieslēgt paziņojumus:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+msgid "Play sound when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+msgid "Hide message count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
+msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:39
-msgid "Webmail notifications and actions for any desktop"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+msgid "Run this command when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:74
-msgid "Mark all as read"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+#, fuzzy
+msgid "Custom sound"
+msgstr "Pielāgotā skaņa:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+msgid "Play a custom sound when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:112
-msgid "Compose Mail"
-msgstr "Sastādīt vēstuli"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+msgid "Merge messages"
+msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:152
-msgid "Sent"
-msgstr "Nosūtītās"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+msgid "Merge messages belonging to the same conversation."
+msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:228
-msgid "Inbox"
-msgstr "Iesūtne"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+msgid "Message action"
+msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+msgid "Action to perform when a message is activated."
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:38
-msgid "Display notifications about new mail"
-msgstr "Rādīt paziņojumus par jaunām vēstulēm"
+#~ msgid "Choose an account"
+#~ msgstr "Izvēlieties kontu"
+
+#~ msgid "Account data"
+#~ msgstr "Konta dati"
+
+#~ msgid "Login:"
+#~ msgstr "Pieteikšanās vārds:"
+
+#~ msgid "Ayatana Webmail"
+#~ msgstr "Ayatana Pasts"
+
+#~ msgid "Compose Mail"
+#~ msgstr "Sastādīt vēstuli"
+
+#~ msgid "Sent"
+#~ msgstr "Nosūtītās"
+
+#~ msgid "Inbox"
+#~ msgstr "Iesūtne"
+
+#~ msgid "Display notifications about new mail"
+#~ msgstr "Rādīt paziņojumus par jaunām vēstulēm"
diff --git a/po/mg.po b/po/mg.po
index adbfafd..c855919 100644
--- a/po/mg.po
+++ b/po/mg.po
@@ -6,9 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail 22.6.28\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/"
-"issues\n"
-"POT-Creation-Date: 2020-08-22 20:15+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -18,300 +17,329 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr ""
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr ""
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr ""
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:204
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr ""
 
-#: ayatanawebmail/application.py:211
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr ""
 
-#: ayatanawebmail/application.py:218
-#: data/usr/share/applications/ayatana-webmail.desktop:35
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr ""
 
-#: ayatanawebmail/application.py:957
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:1110
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr ""
 
-#: ayatanawebmail/application.py:1111
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
-msgid "Unable to connect to account \"{accountName}\", the application will now exit."
+msgid ""
+"Unable to connect to account \"{accountName}\", the application will now "
+"exit."
 msgstr ""
 
-#: ayatanawebmail/application.py:1136
+#: /ayatanawebmail/application.py:1131
 #, python-format
-msgid "You have %d unread mail"
-msgid_plural "You have %d unread mails"
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ayatanawebmail/application.py:1163
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr ""
 
-#: ayatanawebmail/application.py:1165
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1167
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1180
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:60
-msgid "If this string starts with http:// or https://, the application will open it in your browser - otherwise, it will be run as a command"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:61
+msgid ""
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:90 ayatanawebmail/dialog.py:104
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:132
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:140
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:141
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:142
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:143
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:204
-msgid "Please visit the following link and enable access for less secure apps:"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:206
-msgid "Access blocked by Google"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:210
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:211
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:234
-msgid "Custom"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:242
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:244
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:286
-msgid "The application will append this string to \"Inbox\" to access a specific message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+#: /ayatanawebmail/dialog.py:276
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:288
+#: /ayatanawebmail/dialog.py:278
 msgid "Account:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:290
+#: /ayatanawebmail/dialog.py:280
 msgid "Server:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:292
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:294
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:296
+#: /ayatanawebmail/dialog.py:286
 msgid "Username:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:298
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:300
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:302
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:296
 msgid "Sent:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:308
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:310
+#: /ayatanawebmail/dialog.py:300
 msgid "Message:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:346
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:347
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:348
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:358
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:360
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:362
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:364
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:369
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:376
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:392
+#: /ayatanawebmail/dialog.py:382
 msgid "Report a bug"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:394
+#: /ayatanawebmail/dialog.py:384
 msgid "Request a feature"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:396 ayatanawebmail/dialog.py:399
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
 #, python-brace-format
 msgid "It's a good idea to add the {labelname} label to your issue."
 msgstr ""
 
-#: ayatanawebmail/dialog.py:397
+#: /ayatanawebmail/dialog.py:387
 msgid "Ask a question"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:400
+#: /ayatanawebmail/dialog.py:390
 msgid "Help translate"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:402
+#: /ayatanawebmail/dialog.py:392
 msgid "Source code"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:404
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:424
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+msgid "Enable notifications"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+msgid "Play sound when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+msgid "Hide message count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:5
-msgid "Display notifications about new mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+msgid "Run this command when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+msgid "Custom sound"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:5
-msgid "Webmail notifications and actions for any desktop"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+msgid "Play a custom sound when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:15
-msgid "Mark all as read"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+msgid "Merge messages"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:20
-msgid "Compose Mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+msgid "Merge messages belonging to the same conversation."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:25
-msgid "Sent"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+msgid "Message action"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:30
-msgid "Inbox"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+msgid "Action to perform when a message is activated."
 msgstr ""
diff --git a/po/mhr.po b/po/mhr.po
index d5a3ff2..7e8f007 100644
--- a/po/mhr.po
+++ b/po/mhr.po
@@ -6,9 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail 22.6.28\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/"
-"issues\n"
-"POT-Creation-Date: 2020-08-22 20:15+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -18,300 +17,329 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr ""
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr ""
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr ""
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:204
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr ""
 
-#: ayatanawebmail/application.py:211
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr ""
 
-#: ayatanawebmail/application.py:218
-#: data/usr/share/applications/ayatana-webmail.desktop:35
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr ""
 
-#: ayatanawebmail/application.py:957
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:1110
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr ""
 
-#: ayatanawebmail/application.py:1111
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
-msgid "Unable to connect to account \"{accountName}\", the application will now exit."
+msgid ""
+"Unable to connect to account \"{accountName}\", the application will now "
+"exit."
 msgstr ""
 
-#: ayatanawebmail/application.py:1136
+#: /ayatanawebmail/application.py:1131
 #, python-format
-msgid "You have %d unread mail"
-msgid_plural "You have %d unread mails"
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ayatanawebmail/application.py:1163
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr ""
 
-#: ayatanawebmail/application.py:1165
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1167
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1180
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:60
-msgid "If this string starts with http:// or https://, the application will open it in your browser - otherwise, it will be run as a command"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:61
+msgid ""
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:90 ayatanawebmail/dialog.py:104
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:132
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:140
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:141
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:142
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:143
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:204
-msgid "Please visit the following link and enable access for less secure apps:"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:206
-msgid "Access blocked by Google"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:210
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:211
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:234
-msgid "Custom"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:242
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:244
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:286
-msgid "The application will append this string to \"Inbox\" to access a specific message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+#: /ayatanawebmail/dialog.py:276
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:288
+#: /ayatanawebmail/dialog.py:278
 msgid "Account:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:290
+#: /ayatanawebmail/dialog.py:280
 msgid "Server:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:292
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:294
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:296
+#: /ayatanawebmail/dialog.py:286
 msgid "Username:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:298
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:300
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:302
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:296
 msgid "Sent:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:308
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:310
+#: /ayatanawebmail/dialog.py:300
 msgid "Message:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:346
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:347
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:348
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:358
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:360
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:362
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:364
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:369
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:376
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:392
+#: /ayatanawebmail/dialog.py:382
 msgid "Report a bug"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:394
+#: /ayatanawebmail/dialog.py:384
 msgid "Request a feature"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:396 ayatanawebmail/dialog.py:399
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
 #, python-brace-format
 msgid "It's a good idea to add the {labelname} label to your issue."
 msgstr ""
 
-#: ayatanawebmail/dialog.py:397
+#: /ayatanawebmail/dialog.py:387
 msgid "Ask a question"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:400
+#: /ayatanawebmail/dialog.py:390
 msgid "Help translate"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:402
+#: /ayatanawebmail/dialog.py:392
 msgid "Source code"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:404
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:424
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+msgid "Enable notifications"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+msgid "Play sound when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+msgid "Hide message count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:5
-msgid "Display notifications about new mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+msgid "Run this command when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+msgid "Custom sound"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:5
-msgid "Webmail notifications and actions for any desktop"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+msgid "Play a custom sound when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:15
-msgid "Mark all as read"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+msgid "Merge messages"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:20
-msgid "Compose Mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+msgid "Merge messages belonging to the same conversation."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:25
-msgid "Sent"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+msgid "Message action"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:30
-msgid "Inbox"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+msgid "Action to perform when a message is activated."
 msgstr ""
diff --git a/po/mi.po b/po/mi.po
index 54970bb..4ef2ff5 100644
--- a/po/mi.po
+++ b/po/mi.po
@@ -6,9 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail 22.6.28\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/"
-"issues\n"
-"POT-Creation-Date: 2020-08-22 20:15+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -18,300 +17,329 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr ""
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr ""
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr ""
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:204
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr ""
 
-#: ayatanawebmail/application.py:211
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr ""
 
-#: ayatanawebmail/application.py:218
-#: data/usr/share/applications/ayatana-webmail.desktop:35
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr ""
 
-#: ayatanawebmail/application.py:957
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:1110
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr ""
 
-#: ayatanawebmail/application.py:1111
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
-msgid "Unable to connect to account \"{accountName}\", the application will now exit."
+msgid ""
+"Unable to connect to account \"{accountName}\", the application will now "
+"exit."
 msgstr ""
 
-#: ayatanawebmail/application.py:1136
+#: /ayatanawebmail/application.py:1131
 #, python-format
-msgid "You have %d unread mail"
-msgid_plural "You have %d unread mails"
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ayatanawebmail/application.py:1163
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr ""
 
-#: ayatanawebmail/application.py:1165
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1167
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1180
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:60
-msgid "If this string starts with http:// or https://, the application will open it in your browser - otherwise, it will be run as a command"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:61
+msgid ""
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:90 ayatanawebmail/dialog.py:104
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:132
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:140
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:141
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:142
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:143
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:204
-msgid "Please visit the following link and enable access for less secure apps:"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:206
-msgid "Access blocked by Google"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:210
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:211
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:234
-msgid "Custom"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:242
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:244
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:286
-msgid "The application will append this string to \"Inbox\" to access a specific message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+#: /ayatanawebmail/dialog.py:276
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:288
+#: /ayatanawebmail/dialog.py:278
 msgid "Account:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:290
+#: /ayatanawebmail/dialog.py:280
 msgid "Server:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:292
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:294
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:296
+#: /ayatanawebmail/dialog.py:286
 msgid "Username:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:298
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:300
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:302
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:296
 msgid "Sent:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:308
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:310
+#: /ayatanawebmail/dialog.py:300
 msgid "Message:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:346
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:347
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:348
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:358
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:360
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:362
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:364
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:369
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:376
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:392
+#: /ayatanawebmail/dialog.py:382
 msgid "Report a bug"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:394
+#: /ayatanawebmail/dialog.py:384
 msgid "Request a feature"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:396 ayatanawebmail/dialog.py:399
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
 #, python-brace-format
 msgid "It's a good idea to add the {labelname} label to your issue."
 msgstr ""
 
-#: ayatanawebmail/dialog.py:397
+#: /ayatanawebmail/dialog.py:387
 msgid "Ask a question"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:400
+#: /ayatanawebmail/dialog.py:390
 msgid "Help translate"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:402
+#: /ayatanawebmail/dialog.py:392
 msgid "Source code"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:404
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:424
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+msgid "Enable notifications"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+msgid "Play sound when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+msgid "Hide message count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:5
-msgid "Display notifications about new mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+msgid "Run this command when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+msgid "Custom sound"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:5
-msgid "Webmail notifications and actions for any desktop"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+msgid "Play a custom sound when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:15
-msgid "Mark all as read"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+msgid "Merge messages"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:20
-msgid "Compose Mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+msgid "Merge messages belonging to the same conversation."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:25
-msgid "Sent"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+msgid "Message action"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:30
-msgid "Inbox"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+msgid "Action to perform when a message is activated."
 msgstr ""
diff --git a/po/mk.po b/po/mk.po
index 5081c5f..163a119 100644
--- a/po/mk.po
+++ b/po/mk.po
@@ -6,9 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail 22.6.28\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/"
-"issues\n"
-"POT-Creation-Date: 2020-08-22 20:15+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -18,300 +17,329 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n==1 || n%10==1 ? 0 : 1;\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr ""
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr ""
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr ""
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:204
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr ""
 
-#: ayatanawebmail/application.py:211
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr ""
 
-#: ayatanawebmail/application.py:218
-#: data/usr/share/applications/ayatana-webmail.desktop:35
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr ""
 
-#: ayatanawebmail/application.py:957
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:1110
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr ""
 
-#: ayatanawebmail/application.py:1111
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
-msgid "Unable to connect to account \"{accountName}\", the application will now exit."
+msgid ""
+"Unable to connect to account \"{accountName}\", the application will now "
+"exit."
 msgstr ""
 
-#: ayatanawebmail/application.py:1136
+#: /ayatanawebmail/application.py:1131
 #, python-format
-msgid "You have %d unread mail"
-msgid_plural "You have %d unread mails"
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ayatanawebmail/application.py:1163
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr ""
 
-#: ayatanawebmail/application.py:1165
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1167
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1180
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:60
-msgid "If this string starts with http:// or https://, the application will open it in your browser - otherwise, it will be run as a command"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:61
+msgid ""
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:90 ayatanawebmail/dialog.py:104
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:132
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:140
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:141
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:142
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:143
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:204
-msgid "Please visit the following link and enable access for less secure apps:"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:206
-msgid "Access blocked by Google"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:210
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:211
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:234
-msgid "Custom"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:242
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:244
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:286
-msgid "The application will append this string to \"Inbox\" to access a specific message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+#: /ayatanawebmail/dialog.py:276
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:288
+#: /ayatanawebmail/dialog.py:278
 msgid "Account:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:290
+#: /ayatanawebmail/dialog.py:280
 msgid "Server:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:292
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:294
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:296
+#: /ayatanawebmail/dialog.py:286
 msgid "Username:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:298
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:300
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:302
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:296
 msgid "Sent:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:308
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:310
+#: /ayatanawebmail/dialog.py:300
 msgid "Message:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:346
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:347
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:348
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:358
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:360
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:362
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:364
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:369
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:376
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:392
+#: /ayatanawebmail/dialog.py:382
 msgid "Report a bug"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:394
+#: /ayatanawebmail/dialog.py:384
 msgid "Request a feature"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:396 ayatanawebmail/dialog.py:399
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
 #, python-brace-format
 msgid "It's a good idea to add the {labelname} label to your issue."
 msgstr ""
 
-#: ayatanawebmail/dialog.py:397
+#: /ayatanawebmail/dialog.py:387
 msgid "Ask a question"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:400
+#: /ayatanawebmail/dialog.py:390
 msgid "Help translate"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:402
+#: /ayatanawebmail/dialog.py:392
 msgid "Source code"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:404
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:424
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+msgid "Enable notifications"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+msgid "Play sound when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+msgid "Hide message count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:5
-msgid "Display notifications about new mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+msgid "Run this command when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+msgid "Custom sound"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:5
-msgid "Webmail notifications and actions for any desktop"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+msgid "Play a custom sound when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:15
-msgid "Mark all as read"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+msgid "Merge messages"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:20
-msgid "Compose Mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+msgid "Merge messages belonging to the same conversation."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:25
-msgid "Sent"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+msgid "Message action"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:30
-msgid "Inbox"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+msgid "Action to perform when a message is activated."
 msgstr ""
diff --git a/po/ml.po b/po/ml.po
index 21472c0..6ea1e23 100644
--- a/po/ml.po
+++ b/po/ml.po
@@ -6,9 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail 22.6.28\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/"
-"issues\n"
-"POT-Creation-Date: 2020-08-22 20:15+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -18,300 +17,329 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr ""
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr ""
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr ""
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:204
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr ""
 
-#: ayatanawebmail/application.py:211
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr ""
 
-#: ayatanawebmail/application.py:218
-#: data/usr/share/applications/ayatana-webmail.desktop:35
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr ""
 
-#: ayatanawebmail/application.py:957
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:1110
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr ""
 
-#: ayatanawebmail/application.py:1111
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
-msgid "Unable to connect to account \"{accountName}\", the application will now exit."
+msgid ""
+"Unable to connect to account \"{accountName}\", the application will now "
+"exit."
 msgstr ""
 
-#: ayatanawebmail/application.py:1136
+#: /ayatanawebmail/application.py:1131
 #, python-format
-msgid "You have %d unread mail"
-msgid_plural "You have %d unread mails"
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ayatanawebmail/application.py:1163
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr ""
 
-#: ayatanawebmail/application.py:1165
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1167
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1180
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:60
-msgid "If this string starts with http:// or https://, the application will open it in your browser - otherwise, it will be run as a command"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:61
+msgid ""
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:90 ayatanawebmail/dialog.py:104
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:132
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:140
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:141
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:142
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:143
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:204
-msgid "Please visit the following link and enable access for less secure apps:"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:206
-msgid "Access blocked by Google"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:210
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:211
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:234
-msgid "Custom"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:242
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:244
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:286
-msgid "The application will append this string to \"Inbox\" to access a specific message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+#: /ayatanawebmail/dialog.py:276
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:288
+#: /ayatanawebmail/dialog.py:278
 msgid "Account:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:290
+#: /ayatanawebmail/dialog.py:280
 msgid "Server:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:292
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:294
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:296
+#: /ayatanawebmail/dialog.py:286
 msgid "Username:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:298
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:300
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:302
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:296
 msgid "Sent:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:308
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:310
+#: /ayatanawebmail/dialog.py:300
 msgid "Message:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:346
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:347
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:348
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:358
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:360
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:362
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:364
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:369
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:376
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:392
+#: /ayatanawebmail/dialog.py:382
 msgid "Report a bug"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:394
+#: /ayatanawebmail/dialog.py:384
 msgid "Request a feature"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:396 ayatanawebmail/dialog.py:399
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
 #, python-brace-format
 msgid "It's a good idea to add the {labelname} label to your issue."
 msgstr ""
 
-#: ayatanawebmail/dialog.py:397
+#: /ayatanawebmail/dialog.py:387
 msgid "Ask a question"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:400
+#: /ayatanawebmail/dialog.py:390
 msgid "Help translate"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:402
+#: /ayatanawebmail/dialog.py:392
 msgid "Source code"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:404
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:424
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+msgid "Enable notifications"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+msgid "Play sound when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+msgid "Hide message count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:5
-msgid "Display notifications about new mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+msgid "Run this command when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+msgid "Custom sound"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:5
-msgid "Webmail notifications and actions for any desktop"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+msgid "Play a custom sound when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:15
-msgid "Mark all as read"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+msgid "Merge messages"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:20
-msgid "Compose Mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+msgid "Merge messages belonging to the same conversation."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:25
-msgid "Sent"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+msgid "Message action"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:30
-msgid "Inbox"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+msgid "Action to perform when a message is activated."
 msgstr ""
diff --git a/po/mr.po b/po/mr.po
index 21cec34..74927b5 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -6,9 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail 22.6.28\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/"
-"issues\n"
-"POT-Creation-Date: 2020-08-22 20:15+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -18,300 +17,329 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr ""
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr ""
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr ""
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:204
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr ""
 
-#: ayatanawebmail/application.py:211
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr ""
 
-#: ayatanawebmail/application.py:218
-#: data/usr/share/applications/ayatana-webmail.desktop:35
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr ""
 
-#: ayatanawebmail/application.py:957
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:1110
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr ""
 
-#: ayatanawebmail/application.py:1111
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
-msgid "Unable to connect to account \"{accountName}\", the application will now exit."
+msgid ""
+"Unable to connect to account \"{accountName}\", the application will now "
+"exit."
 msgstr ""
 
-#: ayatanawebmail/application.py:1136
+#: /ayatanawebmail/application.py:1131
 #, python-format
-msgid "You have %d unread mail"
-msgid_plural "You have %d unread mails"
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ayatanawebmail/application.py:1163
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr ""
 
-#: ayatanawebmail/application.py:1165
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1167
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1180
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:60
-msgid "If this string starts with http:// or https://, the application will open it in your browser - otherwise, it will be run as a command"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:61
+msgid ""
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:90 ayatanawebmail/dialog.py:104
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:132
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:140
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:141
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:142
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:143
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:204
-msgid "Please visit the following link and enable access for less secure apps:"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:206
-msgid "Access blocked by Google"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:210
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:211
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:234
-msgid "Custom"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:242
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:244
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:286
-msgid "The application will append this string to \"Inbox\" to access a specific message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+#: /ayatanawebmail/dialog.py:276
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:288
+#: /ayatanawebmail/dialog.py:278
 msgid "Account:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:290
+#: /ayatanawebmail/dialog.py:280
 msgid "Server:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:292
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:294
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:296
+#: /ayatanawebmail/dialog.py:286
 msgid "Username:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:298
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:300
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:302
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:296
 msgid "Sent:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:308
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:310
+#: /ayatanawebmail/dialog.py:300
 msgid "Message:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:346
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:347
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:348
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:358
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:360
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:362
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:364
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:369
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:376
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:392
+#: /ayatanawebmail/dialog.py:382
 msgid "Report a bug"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:394
+#: /ayatanawebmail/dialog.py:384
 msgid "Request a feature"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:396 ayatanawebmail/dialog.py:399
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
 #, python-brace-format
 msgid "It's a good idea to add the {labelname} label to your issue."
 msgstr ""
 
-#: ayatanawebmail/dialog.py:397
+#: /ayatanawebmail/dialog.py:387
 msgid "Ask a question"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:400
+#: /ayatanawebmail/dialog.py:390
 msgid "Help translate"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:402
+#: /ayatanawebmail/dialog.py:392
 msgid "Source code"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:404
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:424
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+msgid "Enable notifications"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+msgid "Play sound when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+msgid "Hide message count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:5
-msgid "Display notifications about new mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+msgid "Run this command when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+msgid "Custom sound"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:5
-msgid "Webmail notifications and actions for any desktop"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+msgid "Play a custom sound when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:15
-msgid "Mark all as read"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+msgid "Merge messages"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:20
-msgid "Compose Mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+msgid "Merge messages belonging to the same conversation."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:25
-msgid "Sent"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+msgid "Message action"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:30
-msgid "Inbox"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+msgid "Action to perform when a message is activated."
 msgstr ""
diff --git a/po/ms.po b/po/ms.po
index 9bec977..d2e0af8 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -6,9 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/"
-"issues\n"
-"POT-Creation-Date: 2020-04-03 12:21+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: 2020-09-05 16:36+0000\n"
 "Last-Translator: antuketot76 <antuketot76@protonmail.com>\n"
 "Language-Team: Malay <https://hosted.weblate.org/projects/ayatana-indicators/"
@@ -21,314 +20,406 @@ msgstr ""
 "X-Generator: Weblate 4.3-dev\n"
 "X-Launchpad-Export-Date: 2020-04-04 05:58+0000\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr "Pilih akaun"
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr "Akaun manakah arahan/sesawang yang ingin dibuka?"
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr "Tindakan mesej"
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr "Buang"
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr "Tandakan sudah dibaca"
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr "Buka mesej/Jalankan arahan"
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr "Pengirim"
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr "Subjek"
 
-#: ayatanawebmail/application.py:205
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr "Buka paparan pelayar emel"
 
-#: ayatanawebmail/application.py:212
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr "Bersih"
 
-#: ayatanawebmail/application.py:219
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr "Seting"
 
-#: ayatanawebmail/application.py:980
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr "Tiada tajuk"
 
-#: ayatanawebmail/application.py:1132
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr "Masalah sambungan"
 
-#: ayatanawebmail/application.py:1133
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
 msgid ""
 "Unable to connect to account \"{accountName}\", the application will now "
 "exit."
 msgstr "Gagal sambungan ke akaun \"{accountName}\", aplikasi ditutup sekarang."
 
-#: ayatanawebmail/application.py:1133
-#, python-brace-format
-msgid "You can run \"{command}\" to delete all your login settings."
-msgstr "Anda boleh jalankan \"{command}\" untuk nyahkan semua seting masuk."
-
-#: ayatanawebmail/application.py:1158
-#, python-format
-msgid "You have %d unread mail"
-msgid_plural "You have %d unread mails"
+#: /ayatanawebmail/application.py:1131
+#, fuzzy, python-format
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
 msgstr[0] "Anda mempunyai %d emel belum dibaca"
 msgstr[1] "Anda mempunyai %d emel belum dibaca"
 
-#: ayatanawebmail/application.py:1185
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr "dari %(t0)s, %(t1)s dan lain-lain"
 
-#: ayatanawebmail/application.py:1187
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr "dari %(t0)s dan %(t1)s"
 
-#: ayatanawebmail/application.py:1189
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr "dari %s"
 
-#: ayatanawebmail/application.py:1202
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr "Mel baru daripada %s"
 
-#: ayatanawebmail/dialog.py:60
-msgid "Web page"
-msgstr "Paparan pelayar"
-
-#: ayatanawebmail/dialog.py:61
-msgid "Command"
-msgstr "Arahan"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
+msgstr ""
 
-#: ayatanawebmail/dialog.py:93
+#: /ayatanawebmail/dialog.py:61
 msgid ""
-"Append an additional string - you can use the $MSG_THREAD and $MSG_UID "
-"placeholders."
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
-"Masukkkan tambahan string - anda boleh guna $MSG_THREAD dan $MSG_UID "
-"ditempat pakai."
 
-#: ayatanawebmail/dialog.py:114 ayatanawebmail/dialog.py:128
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr "(Tiada)"
 
-#: ayatanawebmail/dialog.py:156
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr "Ayatana Rujukan Pelayar emel"
 
-#: ayatanawebmail/dialog.py:164
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr "Akaun"
 
-#: ayatanawebmail/dialog.py:165
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr "Pilihan"
 
-#: ayatanawebmail/dialog.py:166
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr "Sokongan"
 
-#: ayatanawebmail/dialog.py:167
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr "Tentang"
 
-#: ayatanawebmail/dialog.py:228
-msgid ""
-"Please visit the following link and enable access for less secure apps:"
-msgstr "Sila kunjungi link ini dan aktifkan akses untuk apps tanpa sekuriti:"
-
-#: ayatanawebmail/dialog.py:230
-msgid "Access blocked by Google"
-msgstr "Akses disekat oleh Google"
-
-#: ayatanawebmail/dialog.py:234
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr "Sambungan gagal ke akaun emel. Masalah merujuk ialah:"
 
-#: ayatanawebmail/dialog.py:235
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr "Sambungan gagal"
 
-#: ayatanawebmail/dialog.py:254
-msgid "Choose an account"
-msgstr "Pilih akaun"
-
-#: ayatanawebmail/dialog.py:259
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr "Tambah"
 
-#: ayatanawebmail/dialog.py:261
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr "Keluarkan"
 
-#: ayatanawebmail/dialog.py:276
-msgid "Server data"
-msgstr "Data pelayan"
+#: /ayatanawebmail/dialog.py:276
+#, fuzzy
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+msgstr ""
+"Masukkkan tambahan string - anda boleh guna $MSG_THREAD dan $MSG_UID "
+"ditempat pakai."
 
-#: ayatanawebmail/dialog.py:278
-msgid "Account data"
-msgstr "Data akaun"
+#: /ayatanawebmail/dialog.py:278
+#, fuzzy
+msgid "Account:"
+msgstr "Akaun"
 
-#: ayatanawebmail/dialog.py:289
-msgid "Links"
-msgstr "Link"
+#: /ayatanawebmail/dialog.py:280
+#, fuzzy
+msgid "Server:"
+msgstr "Data pelayan"
 
-#: ayatanawebmail/dialog.py:297
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr "Hos:"
 
-#: ayatanawebmail/dialog.py:299
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr "Port:"
 
-#: ayatanawebmail/dialog.py:302
-msgid "Login:"
-msgstr "Daftar Masuk:"
+#: /ayatanawebmail/dialog.py:286
+msgid "Username:"
+msgstr ""
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr "Kata Laluan:"
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr "Folder:"
 
-#: ayatanawebmail/dialog.py:309
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr "Rumah:"
 
-#: ayatanawebmail/dialog.py:311
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr "Gubah:"
 
-#: ayatanawebmail/dialog.py:313
+#: /ayatanawebmail/dialog.py:296
+msgid "Sent:"
+msgstr "Dihantar:"
+
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr "Kotak masuk:"
 
-#: ayatanawebmail/dialog.py:316
-msgid "Sent:"
-msgstr "Dihantar:"
+#: /ayatanawebmail/dialog.py:300
+#, fuzzy
+msgid "Message:"
+msgstr "Tindakan mesej"
 
-#: ayatanawebmail/dialog.py:354
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr "Tandakan mesej sudah dibaca"
 
-#: ayatanawebmail/dialog.py:355
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr "Buka mesej di pelayar/Jalankan arahan"
 
-#: ayatanawebmail/dialog.py:356
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr "Tanya saya untuk tindakan seterusnya"
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr "Benarkan pemberitahuan:"
 
-#: ayatanawebmail/dialog.py:368
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr "Bunyikan bila mesej diterima:"
 
-#: ayatanawebmail/dialog.py:370
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr "Campurkan mesej dari perbualan yang sama:"
 
-#: ayatanawebmail/dialog.py:372
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr "Sembunyi kiraan bila kosong:"
 
-#: ayatanawebmail/dialog.py:374
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr "Apabila mesej diaktifkan:"
 
-#: ayatanawebmail/dialog.py:377
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr "Jalankan arahan ini bila mesej diterima:"
 
-#: ayatanawebmail/dialog.py:384
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr "Bunyi lain untuk digunakan:"
 
-#: ayatanawebmail/dialog.py:400
-msgid "Report a bug/Request a feature"
+#: /ayatanawebmail/dialog.py:382
+msgid "Report a bug"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:384
+#, fuzzy
+msgid "Request a feature"
 msgstr "Repot kepincangan/Memohon tambahan"
 
-#: ayatanawebmail/dialog.py:402
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
+#, python-brace-format
+msgid "It's a good idea to add the {labelname} label to your issue."
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:387
 msgid "Ask a question"
 msgstr "Tanya soalan"
 
-#: ayatanawebmail/dialog.py:404
+#: /ayatanawebmail/dialog.py:390
 msgid "Help translate"
 msgstr "Bantu tranlasi"
 
-#: ayatanawebmail/dialog.py:406
-msgid "Project page"
-msgstr "Paparan projek"
-
-#: ayatanawebmail/dialog.py:408
+#: /ayatanawebmail/dialog.py:392
 msgid "Source code"
 msgstr "Punca kod"
 
-#: ayatanawebmail/dialog.py:410
-msgid "Repository"
-msgstr "Tempat Simpanan"
-
-#: ayatanawebmail/dialog.py:412
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr "Paparan Utama"
 
-#: ayatanawebmail/dialog.py:426
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr "translasi-penghargaan"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
-msgstr "Ayatana Webmail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+#, fuzzy
+msgid "Enable notifications"
+msgstr "Benarkan pemberitahuan:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+#, fuzzy
+msgid "Play sound when new messages arrive."
+msgstr "Bunyikan bila mesej diterima:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+#, fuzzy
+msgid "Hide message count"
+msgstr "Buka mesej/Jalankan arahan"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+#, fuzzy
+msgid "Run this command when new messages arrive."
+msgstr "Jalankan arahan ini bila mesej diterima:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+#, fuzzy
+msgid "Custom sound"
+msgstr "Bunyi lain untuk digunakan:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+#, fuzzy
+msgid "Play a custom sound when new messages arrive."
+msgstr "Bunyikan bila mesej diterima:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+#, fuzzy
+msgid "Merge messages"
+msgstr "Tandakan mesej sudah dibaca"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+#, fuzzy
+msgid "Merge messages belonging to the same conversation."
+msgstr "Campurkan mesej dari perbualan yang sama:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+#, fuzzy
+msgid "Message action"
+msgstr "Tindakan mesej"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+#, fuzzy
+msgid "Action to perform when a message is activated."
+msgstr "Apabila mesej diaktifkan:"
+
+#, python-brace-format
+#~ msgid "You can run \"{command}\" to delete all your login settings."
+#~ msgstr "Anda boleh jalankan \"{command}\" untuk nyahkan semua seting masuk."
+
+#~ msgid "Web page"
+#~ msgstr "Paparan pelayar"
+
+#~ msgid "Command"
+#~ msgstr "Arahan"
+
+#~ msgid ""
+#~ "Please visit the following link and enable access for less secure apps:"
+#~ msgstr ""
+#~ "Sila kunjungi link ini dan aktifkan akses untuk apps tanpa sekuriti:"
+
+#~ msgid "Access blocked by Google"
+#~ msgstr "Akses disekat oleh Google"
+
+#~ msgid "Choose an account"
+#~ msgstr "Pilih akaun"
+
+#~ msgid "Account data"
+#~ msgstr "Data akaun"
+
+#~ msgid "Links"
+#~ msgstr "Link"
+
+#~ msgid "Login:"
+#~ msgstr "Daftar Masuk:"
+
+#~ msgid "Project page"
+#~ msgstr "Paparan projek"
+
+#~ msgid "Repository"
+#~ msgstr "Tempat Simpanan"
+
+#~ msgid "Ayatana Webmail"
+#~ msgstr "Ayatana Webmail"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:39
-msgid "Webmail notifications and actions for any desktop"
-msgstr "Notifikasi Webmail dan arahan untuk semua desktop"
+#~ msgid "Webmail notifications and actions for any desktop"
+#~ msgstr "Notifikasi Webmail dan arahan untuk semua desktop"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:74
-msgid "Mark all as read"
-msgstr "Tandakan semua sudah dibaca"
+#~ msgid "Mark all as read"
+#~ msgstr "Tandakan semua sudah dibaca"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:112
-msgid "Compose Mail"
-msgstr "Gubah Mel"
+#~ msgid "Compose Mail"
+#~ msgstr "Gubah Mel"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:152
-msgid "Sent"
-msgstr "Dihantar"
+#~ msgid "Sent"
+#~ msgstr "Dihantar"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:228
-msgid "Inbox"
-msgstr "Kotak Masuk"
+#~ msgid "Inbox"
+#~ msgstr "Kotak Masuk"
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
-msgstr "Ayatana Webmail (servis)"
+#~ msgid "Ayatana Webmail (service)"
+#~ msgstr "Ayatana Webmail (servis)"
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:38
-msgid "Display notifications about new mail"
-msgstr "Papar pemberitahuan mengenai mel baru"
+#~ msgid "Display notifications about new mail"
+#~ msgstr "Papar pemberitahuan mengenai mel baru"
diff --git a/po/my.po b/po/my.po
index df0314f..6b03de6 100644
--- a/po/my.po
+++ b/po/my.po
@@ -6,9 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail 22.6.28\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/"
-"issues\n"
-"POT-Creation-Date: 2020-08-22 20:15+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -18,299 +17,328 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr ""
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr ""
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr ""
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:204
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr ""
 
-#: ayatanawebmail/application.py:211
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr ""
 
-#: ayatanawebmail/application.py:218
-#: data/usr/share/applications/ayatana-webmail.desktop:35
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr ""
 
-#: ayatanawebmail/application.py:957
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:1110
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr ""
 
-#: ayatanawebmail/application.py:1111
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
-msgid "Unable to connect to account \"{accountName}\", the application will now exit."
+msgid ""
+"Unable to connect to account \"{accountName}\", the application will now "
+"exit."
 msgstr ""
 
-#: ayatanawebmail/application.py:1136
+#: /ayatanawebmail/application.py:1131
 #, python-format
-msgid "You have %d unread mail"
-msgid_plural "You have %d unread mails"
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
 msgstr[0] ""
 
-#: ayatanawebmail/application.py:1163
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr ""
 
-#: ayatanawebmail/application.py:1165
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1167
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1180
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:60
-msgid "If this string starts with http:// or https://, the application will open it in your browser - otherwise, it will be run as a command"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:61
+msgid ""
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:90 ayatanawebmail/dialog.py:104
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:132
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:140
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:141
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:142
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:143
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:204
-msgid "Please visit the following link and enable access for less secure apps:"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:206
-msgid "Access blocked by Google"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:210
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:211
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:234
-msgid "Custom"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:242
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:244
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:286
-msgid "The application will append this string to \"Inbox\" to access a specific message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+#: /ayatanawebmail/dialog.py:276
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:288
+#: /ayatanawebmail/dialog.py:278
 msgid "Account:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:290
+#: /ayatanawebmail/dialog.py:280
 msgid "Server:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:292
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:294
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:296
+#: /ayatanawebmail/dialog.py:286
 msgid "Username:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:298
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:300
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:302
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:296
 msgid "Sent:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:308
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:310
+#: /ayatanawebmail/dialog.py:300
 msgid "Message:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:346
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:347
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:348
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:358
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:360
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:362
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:364
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:369
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:376
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:392
+#: /ayatanawebmail/dialog.py:382
 msgid "Report a bug"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:394
+#: /ayatanawebmail/dialog.py:384
 msgid "Request a feature"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:396 ayatanawebmail/dialog.py:399
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
 #, python-brace-format
 msgid "It's a good idea to add the {labelname} label to your issue."
 msgstr ""
 
-#: ayatanawebmail/dialog.py:397
+#: /ayatanawebmail/dialog.py:387
 msgid "Ask a question"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:400
+#: /ayatanawebmail/dialog.py:390
 msgid "Help translate"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:402
+#: /ayatanawebmail/dialog.py:392
 msgid "Source code"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:404
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:424
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+msgid "Enable notifications"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+msgid "Play sound when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+msgid "Hide message count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:5
-msgid "Display notifications about new mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+msgid "Run this command when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+msgid "Custom sound"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:5
-msgid "Webmail notifications and actions for any desktop"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+msgid "Play a custom sound when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:15
-msgid "Mark all as read"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+msgid "Merge messages"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:20
-msgid "Compose Mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+msgid "Merge messages belonging to the same conversation."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:25
-msgid "Sent"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+msgid "Message action"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:30
-msgid "Inbox"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+msgid "Action to perform when a message is activated."
 msgstr ""
diff --git a/po/nb.po b/po/nb.po
new file mode 100644
index 0000000..7cf4199
--- /dev/null
+++ b/po/nb.po
@@ -0,0 +1,345 @@
+# Norwegian Bokmal translations for PACKAGE package.
+# Copyright (C) 2022 THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# Automatically generated, 2022.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
+"PO-Revision-Date: 2022-09-11 12:53+0200\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: nb\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ASCII\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: /ayatanawebmail/accounts.py:18
+msgid "Select account"
+msgstr ""
+
+#: /ayatanawebmail/accounts.py:29
+msgid "Which account's command/web page would you like to open?"
+msgstr ""
+
+#: /ayatanawebmail/actions.py:15
+msgid "Message actions"
+msgstr ""
+
+#: /ayatanawebmail/actions.py:15
+msgid "Delete"
+msgstr ""
+
+#: /ayatanawebmail/actions.py:15
+msgid "Mark as read"
+msgstr ""
+
+#: /ayatanawebmail/actions.py:15
+msgid "Open message/Run command"
+msgstr ""
+
+#: /ayatanawebmail/actions.py:24
+msgid "Sender"
+msgstr ""
+
+#: /ayatanawebmail/actions.py:26
+msgid "Subject"
+msgstr ""
+
+#: /ayatanawebmail/application.py:178
+msgid "Open webmail home page"
+msgstr ""
+
+#: /ayatanawebmail/application.py:185
+msgid "Clear"
+msgstr ""
+
+#: /ayatanawebmail/application.py:192
+msgid "Settings"
+msgstr ""
+
+#: /ayatanawebmail/application.py:945
+msgid "No subject"
+msgstr ""
+
+#: /ayatanawebmail/application.py:1105
+msgid "Connection error"
+msgstr ""
+
+#: /ayatanawebmail/application.py:1106
+#, python-brace-format
+msgid ""
+"Unable to connect to account \"{accountName}\", the application will now "
+"exit."
+msgstr ""
+
+#: /ayatanawebmail/application.py:1131
+#, python-format
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
+msgstr[0] ""
+msgstr[1] ""
+
+#: /ayatanawebmail/application.py:1158
+#, python-format
+msgid "from %(t0)s, %(t1)s and others"
+msgstr ""
+
+#: /ayatanawebmail/application.py:1160
+#, python-format
+msgid "from %(t0)s and %(t1)s"
+msgstr ""
+
+#: /ayatanawebmail/application.py:1162
+#, python-format
+msgid "from %s"
+msgstr ""
+
+#: /ayatanawebmail/application.py:1175
+#, python-format
+msgid "New mail from %s"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:61
+msgid ""
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
+msgid "(None)"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:133
+msgid "Ayatana Webmail Preferences"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:141
+msgid "Accounts"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:142
+msgid "Options"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:143
+msgid "Support"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:144
+msgid "About"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:203
+msgid "Failed to connect to mail account. The returned error was:"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:204
+msgid "Connection failure"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:232
+msgid "Add"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:234
+msgid "Remove"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:276
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:278
+msgid "Account:"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:280
+msgid "Server:"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:282
+msgid "Host:"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:284
+msgid "Port:"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:286
+msgid "Username:"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:288
+msgid "Password:"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:290
+msgid "Folders:"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:292
+msgid "Home:"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:294
+msgid "Compose:"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:296
+msgid "Sent:"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:298
+msgid "Inbox:"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:300
+msgid "Message:"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:336
+msgid "Mark message as read"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:337
+msgid "Open message in browser/Execute command"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:338
+msgid "Ask me what to do"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:348
+msgid "Enable notifications:"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:350
+msgid "Play sound when a message is received:"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:352
+msgid "Merge messages from the same conversation:"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:354
+msgid "Hide count when zero:"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:356
+msgid "When a message is activated:"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:359
+msgid "Execute this command when a message is received:"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:366
+msgid "Custom sound to play:"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:382
+msgid "Report a bug"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:384
+msgid "Request a feature"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
+#, python-brace-format
+msgid "It's a good idea to add the {labelname} label to your issue."
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:387
+msgid "Ask a question"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:390
+msgid "Help translate"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:392
+msgid "Source code"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:394
+msgid "Home page"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:414
+msgid "translator-credits"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+msgid "Enable notifications"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+msgid "Play sound when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+msgid "Hide message count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+msgid "Run this command when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+msgid "Custom sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+msgid "Play a custom sound when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+msgid "Merge messages"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+msgid "Merge messages belonging to the same conversation."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+msgid "Message action"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+msgid "Action to perform when a message is activated."
+msgstr ""
diff --git a/po/ne.po b/po/ne.po
index 3dab31f..04aa8c4 100644
--- a/po/ne.po
+++ b/po/ne.po
@@ -6,9 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail 22.6.28\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/"
-"issues\n"
-"POT-Creation-Date: 2020-08-22 20:15+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -18,300 +17,329 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr ""
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr ""
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr ""
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:204
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr ""
 
-#: ayatanawebmail/application.py:211
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr ""
 
-#: ayatanawebmail/application.py:218
-#: data/usr/share/applications/ayatana-webmail.desktop:35
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr ""
 
-#: ayatanawebmail/application.py:957
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:1110
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr ""
 
-#: ayatanawebmail/application.py:1111
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
-msgid "Unable to connect to account \"{accountName}\", the application will now exit."
+msgid ""
+"Unable to connect to account \"{accountName}\", the application will now "
+"exit."
 msgstr ""
 
-#: ayatanawebmail/application.py:1136
+#: /ayatanawebmail/application.py:1131
 #, python-format
-msgid "You have %d unread mail"
-msgid_plural "You have %d unread mails"
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ayatanawebmail/application.py:1163
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr ""
 
-#: ayatanawebmail/application.py:1165
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1167
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1180
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:60
-msgid "If this string starts with http:// or https://, the application will open it in your browser - otherwise, it will be run as a command"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:61
+msgid ""
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:90 ayatanawebmail/dialog.py:104
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:132
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:140
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:141
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:142
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:143
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:204
-msgid "Please visit the following link and enable access for less secure apps:"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:206
-msgid "Access blocked by Google"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:210
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:211
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:234
-msgid "Custom"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:242
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:244
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:286
-msgid "The application will append this string to \"Inbox\" to access a specific message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+#: /ayatanawebmail/dialog.py:276
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:288
+#: /ayatanawebmail/dialog.py:278
 msgid "Account:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:290
+#: /ayatanawebmail/dialog.py:280
 msgid "Server:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:292
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:294
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:296
+#: /ayatanawebmail/dialog.py:286
 msgid "Username:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:298
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:300
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:302
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:296
 msgid "Sent:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:308
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:310
+#: /ayatanawebmail/dialog.py:300
 msgid "Message:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:346
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:347
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:348
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:358
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:360
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:362
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:364
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:369
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:376
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:392
+#: /ayatanawebmail/dialog.py:382
 msgid "Report a bug"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:394
+#: /ayatanawebmail/dialog.py:384
 msgid "Request a feature"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:396 ayatanawebmail/dialog.py:399
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
 #, python-brace-format
 msgid "It's a good idea to add the {labelname} label to your issue."
 msgstr ""
 
-#: ayatanawebmail/dialog.py:397
+#: /ayatanawebmail/dialog.py:387
 msgid "Ask a question"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:400
+#: /ayatanawebmail/dialog.py:390
 msgid "Help translate"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:402
+#: /ayatanawebmail/dialog.py:392
 msgid "Source code"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:404
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:424
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+msgid "Enable notifications"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+msgid "Play sound when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+msgid "Hide message count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:5
-msgid "Display notifications about new mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+msgid "Run this command when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+msgid "Custom sound"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:5
-msgid "Webmail notifications and actions for any desktop"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+msgid "Play a custom sound when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:15
-msgid "Mark all as read"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+msgid "Merge messages"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:20
-msgid "Compose Mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+msgid "Merge messages belonging to the same conversation."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:25
-msgid "Sent"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+msgid "Message action"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:30
-msgid "Inbox"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+msgid "Action to perform when a message is activated."
 msgstr ""
diff --git a/po/nl.po b/po/nl.po
index 8492541..eaea2b2 100755
--- a/po/nl.po
+++ b/po/nl.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/issues\n"
-"POT-Creation-Date: 2020-04-03 12:21+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: 2018-06-04 07:33+0000\n"
 "Language-Team: Dutch <nl@li.org>\n"
+"Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -17,312 +18,359 @@ msgstr ""
 "X-Launchpad-Export-Date: 2020-04-04 05:58+0000\n"
 "X-Generator: Launchpad (build a296f04231dee355be5db73cc878b9e21689a253)\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr ""
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr ""
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr ""
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:205
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr ""
 
-#: ayatanawebmail/application.py:212
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr ""
 
-#: ayatanawebmail/application.py:219
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr ""
 
-#: ayatanawebmail/application.py:980
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr "Geen onderwerp"
 
-#: ayatanawebmail/application.py:1132
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr ""
 
-#: ayatanawebmail/application.py:1133
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
 msgid ""
 "Unable to connect to account \"{accountName}\", the application will now "
 "exit."
 msgstr ""
 
-#: ayatanawebmail/application.py:1133
-#, python-brace-format
-msgid "You can run \"{command}\" to delete all your login settings."
-msgstr ""
-
-#: ayatanawebmail/application.py:1158
-#, python-format
-msgid "You have %d unread mail"
-msgid_plural "You have %d unread mails"
+#: /ayatanawebmail/application.py:1131
+#, fuzzy, python-format
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
 msgstr[0] "U heeft %d ongelezen bericht"
 msgstr[1] "U heeft %d ongelezen berichten"
 
-#: ayatanawebmail/application.py:1185
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr "van %(t0)s, %(t1)s en anderen"
 
-#: ayatanawebmail/application.py:1187
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr "van %(t0)s en %(t1)s"
 
-#: ayatanawebmail/application.py:1189
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr "van %s"
 
-#: ayatanawebmail/application.py:1202
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr "Nieuw bericht van %s"
 
-#: ayatanawebmail/dialog.py:60
-msgid "Web page"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:61
-msgid "Command"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:93
+#: /ayatanawebmail/dialog.py:61
 msgid ""
-"Append an additional string - you can use the $MSG_THREAD and $MSG_UID "
-"placeholders."
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:114 ayatanawebmail/dialog.py:128
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:156
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr "Ayatana Webmail-instellingen"
 
-#: ayatanawebmail/dialog.py:164
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr "Accounts"
 
-#: ayatanawebmail/dialog.py:165
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr "Instellingen"
 
-#: ayatanawebmail/dialog.py:166
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:167
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:228
-msgid ""
-"Please visit the following link and enable access for less secure apps:"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:230
-msgid "Access blocked by Google"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:234
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:235
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:254
-msgid "Choose an account"
-msgstr "Een account kiezen"
-
-#: ayatanawebmail/dialog.py:259
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:261
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:276
-msgid "Server data"
-msgstr "Servergegevens:"
+#: /ayatanawebmail/dialog.py:276
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+msgstr ""
 
-#: ayatanawebmail/dialog.py:278
-msgid "Account data"
-msgstr "Accountgegevens"
+#: /ayatanawebmail/dialog.py:278
+#, fuzzy
+msgid "Account:"
+msgstr "Accounts"
 
-#: ayatanawebmail/dialog.py:289
-msgid "Links"
-msgstr ""
+#: /ayatanawebmail/dialog.py:280
+#, fuzzy
+msgid "Server:"
+msgstr "Servergegevens:"
 
-#: ayatanawebmail/dialog.py:297
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr "Host:"
 
-#: ayatanawebmail/dialog.py:299
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr "Poort:"
 
-#: ayatanawebmail/dialog.py:302
-msgid "Login:"
-msgstr "Inlognaam:"
+#: /ayatanawebmail/dialog.py:286
+msgid "Username:"
+msgstr ""
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr "Wachtwoord:"
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:309
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr "Startpagina:"
 
-#: ayatanawebmail/dialog.py:311
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr "Opstellen:"
 
-#: ayatanawebmail/dialog.py:313
+#: /ayatanawebmail/dialog.py:296
+msgid "Sent:"
+msgstr "Verzonden:"
+
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr "Postvak in:"
 
-#: ayatanawebmail/dialog.py:316
-msgid "Sent:"
-msgstr "Verzonden:"
+#: /ayatanawebmail/dialog.py:300
+msgid "Message:"
+msgstr ""
 
-#: ayatanawebmail/dialog.py:354
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:355
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:356
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr "Notificaties inschakelen:"
 
-#: ayatanawebmail/dialog.py:368
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:370
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:372
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:374
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:377
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:384
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:400
-msgid "Report a bug/Request a feature"
+#: /ayatanawebmail/dialog.py:382
+msgid "Report a bug"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:402
-msgid "Ask a question"
+#: /ayatanawebmail/dialog.py:384
+msgid "Request a feature"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:404
-msgid "Help translate"
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
+#, python-brace-format
+msgid "It's a good idea to add the {labelname} label to your issue."
 msgstr ""
 
-#: ayatanawebmail/dialog.py:406
-msgid "Project page"
+#: /ayatanawebmail/dialog.py:387
+msgid "Ask a question"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:408
-msgid "Source code"
+#: /ayatanawebmail/dialog.py:390
+msgid "Help translate"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:410
-msgid "Repository"
+#: /ayatanawebmail/dialog.py:392
+msgid "Source code"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:412
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:426
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
-msgstr "Ayatana Webmail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+#, fuzzy
+msgid "Enable notifications"
+msgstr "Notificaties inschakelen:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+msgid "Play sound when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+msgid "Hide message count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:39
-msgid "Webmail notifications and actions for any desktop"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:74
-msgid "Mark all as read"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+msgid "Run this command when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:112
-msgid "Compose Mail"
-msgstr "Stel een e-mail op"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+msgid "Custom sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+msgid "Play a custom sound when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+msgid "Merge messages"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+msgid "Merge messages belonging to the same conversation."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+msgid "Message action"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+msgid "Action to perform when a message is activated."
+msgstr ""
+
+#~ msgid "Choose an account"
+#~ msgstr "Een account kiezen"
+
+#~ msgid "Account data"
+#~ msgstr "Accountgegevens"
+
+#~ msgid "Login:"
+#~ msgstr "Inlognaam:"
+
+#~ msgid "Ayatana Webmail"
+#~ msgstr "Ayatana Webmail"
+
+#~ msgid "Compose Mail"
+#~ msgstr "Stel een e-mail op"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:152
-msgid "Sent"
-msgstr "Verzonden"
+#~ msgid "Sent"
+#~ msgstr "Verzonden"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:228
-msgid "Inbox"
-msgstr "Postvak IN"
+#~ msgid "Inbox"
+#~ msgstr "Postvak IN"
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
-msgstr "Ayatana Webmail (service)"
+#~ msgid "Ayatana Webmail (service)"
+#~ msgstr "Ayatana Webmail (service)"
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:38
-msgid "Display notifications about new mail"
-msgstr "Meldingen geven voor nieuwe e-mails"
+#~ msgid "Display notifications about new mail"
+#~ msgstr "Meldingen geven voor nieuwe e-mails"
diff --git a/po/nn.po b/po/nn.po
index 4582f25..998d80f 100755
--- a/po/nn.po
+++ b/po/nn.po
@@ -6,324 +6,371 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/issues\n"
-"POT-Creation-Date: 2020-04-03 12:21+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: 2018-06-04 07:33+0000\n"
 "Language-Team: Norwegian Nynorsk <nn@li.org>\n"
+"Language: nn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Launchpad-Export-Date: 2020-04-04 05:58+0000\n"
 "X-Generator: Launchpad (build a296f04231dee355be5db73cc878b9e21689a253)\n"
-"Language: nn\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr ""
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr ""
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr ""
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:205
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr ""
 
-#: ayatanawebmail/application.py:212
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr ""
 
-#: ayatanawebmail/application.py:219
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr ""
 
-#: ayatanawebmail/application.py:980
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr "Ingen emne"
 
-#: ayatanawebmail/application.py:1132
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr ""
 
-#: ayatanawebmail/application.py:1133
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
 msgid ""
 "Unable to connect to account \"{accountName}\", the application will now "
 "exit."
 msgstr ""
 
-#: ayatanawebmail/application.py:1133
-#, python-brace-format
-msgid "You can run \"{command}\" to delete all your login settings."
-msgstr ""
-
-#: ayatanawebmail/application.py:1158
-#, python-format
-msgid "You have %d unread mail"
-msgid_plural "You have %d unread mails"
+#: /ayatanawebmail/application.py:1131
+#, fuzzy, python-format
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
 msgstr[0] "Du har %d ulesen e-post"
 msgstr[1] "Du har %d ulesne e-postar"
 
-#: ayatanawebmail/application.py:1185
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr "frå %(t0)s, %(t1)s og andre"
 
-#: ayatanawebmail/application.py:1187
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr "frå %(t0)s og %(t1)s"
 
-#: ayatanawebmail/application.py:1189
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr "frå %s"
 
-#: ayatanawebmail/application.py:1202
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr "Ny e-post frå %s"
 
-#: ayatanawebmail/dialog.py:60
-msgid "Web page"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:61
-msgid "Command"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:93
+#: /ayatanawebmail/dialog.py:61
 msgid ""
-"Append an additional string - you can use the $MSG_THREAD and $MSG_UID "
-"placeholders."
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:114 ayatanawebmail/dialog.py:128
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:156
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr "Ayatana Webmail Innstillingar"
 
-#: ayatanawebmail/dialog.py:164
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr "Kontoar"
 
-#: ayatanawebmail/dialog.py:165
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr "Innstillingar"
 
-#: ayatanawebmail/dialog.py:166
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:167
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:228
-msgid ""
-"Please visit the following link and enable access for less secure apps:"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:230
-msgid "Access blocked by Google"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:234
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:235
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:254
-msgid "Choose an account"
-msgstr "Vel konto"
-
-#: ayatanawebmail/dialog.py:259
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:261
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:276
-msgid "Server data"
-msgstr "Tenar informasjon"
+#: /ayatanawebmail/dialog.py:276
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+msgstr ""
 
-#: ayatanawebmail/dialog.py:278
-msgid "Account data"
-msgstr "Kontodetaljar"
+#: /ayatanawebmail/dialog.py:278
+#, fuzzy
+msgid "Account:"
+msgstr "Kontoar"
 
-#: ayatanawebmail/dialog.py:289
-msgid "Links"
-msgstr ""
+#: /ayatanawebmail/dialog.py:280
+#, fuzzy
+msgid "Server:"
+msgstr "Tenar informasjon"
 
-#: ayatanawebmail/dialog.py:297
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr "Vert:"
 
-#: ayatanawebmail/dialog.py:299
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr "Port:"
 
-#: ayatanawebmail/dialog.py:302
-msgid "Login:"
-msgstr "Brukarnamn:"
+#: /ayatanawebmail/dialog.py:286
+msgid "Username:"
+msgstr ""
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr "Passord:"
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:309
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr "Heim:"
 
-#: ayatanawebmail/dialog.py:311
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr "Skriv ny:"
 
-#: ayatanawebmail/dialog.py:313
+#: /ayatanawebmail/dialog.py:296
+msgid "Sent:"
+msgstr "Sendt e-post:"
+
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr "Innboks:"
 
-#: ayatanawebmail/dialog.py:316
-msgid "Sent:"
-msgstr "Sendt e-post:"
+#: /ayatanawebmail/dialog.py:300
+msgid "Message:"
+msgstr ""
 
-#: ayatanawebmail/dialog.py:354
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:355
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:356
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr "Slå på skjermmeldingar:"
 
-#: ayatanawebmail/dialog.py:368
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:370
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:372
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:374
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:377
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:384
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:400
-msgid "Report a bug/Request a feature"
+#: /ayatanawebmail/dialog.py:382
+msgid "Report a bug"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:402
-msgid "Ask a question"
+#: /ayatanawebmail/dialog.py:384
+msgid "Request a feature"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:404
-msgid "Help translate"
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
+#, python-brace-format
+msgid "It's a good idea to add the {labelname} label to your issue."
 msgstr ""
 
-#: ayatanawebmail/dialog.py:406
-msgid "Project page"
+#: /ayatanawebmail/dialog.py:387
+msgid "Ask a question"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:408
-msgid "Source code"
+#: /ayatanawebmail/dialog.py:390
+msgid "Help translate"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:410
-msgid "Repository"
+#: /ayatanawebmail/dialog.py:392
+msgid "Source code"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:412
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:426
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
-msgstr "Ayatana Webmail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+#, fuzzy
+msgid "Enable notifications"
+msgstr "Slå på skjermmeldingar:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+msgid "Play sound when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+msgid "Hide message count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+msgid "Run this command when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+msgid "Custom sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+msgid "Play a custom sound when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+msgid "Merge messages"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+msgid "Merge messages belonging to the same conversation."
+msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:39
-msgid "Webmail notifications and actions for any desktop"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+msgid "Message action"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:74
-msgid "Mark all as read"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+msgid "Action to perform when a message is activated."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:112
-msgid "Compose Mail"
-msgstr "Skriv ny"
+#~ msgid "Choose an account"
+#~ msgstr "Vel konto"
+
+#~ msgid "Account data"
+#~ msgstr "Kontodetaljar"
+
+#~ msgid "Login:"
+#~ msgstr "Brukarnamn:"
+
+#~ msgid "Ayatana Webmail"
+#~ msgstr "Ayatana Webmail"
+
+#~ msgid "Compose Mail"
+#~ msgstr "Skriv ny"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:152
-msgid "Sent"
-msgstr "Sendt e-post"
+#~ msgid "Sent"
+#~ msgstr "Sendt e-post"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:228
-msgid "Inbox"
-msgstr "Innboks"
+#~ msgid "Inbox"
+#~ msgstr "Innboks"
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
-msgstr "Ayatana Webmail"
+#~ msgid "Ayatana Webmail (service)"
+#~ msgstr "Ayatana Webmail"
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:38
-msgid "Display notifications about new mail"
-msgstr "Vis varslingar når du får ny e-post"
+#~ msgid "Display notifications about new mail"
+#~ msgstr "Vis varslingar når du får ny e-post"
diff --git a/po/ny.po b/po/ny.po
index bcc0354..9b1cd40 100644
--- a/po/ny.po
+++ b/po/ny.po
@@ -6,9 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail 22.6.28\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/"
-"issues\n"
-"POT-Creation-Date: 2020-08-22 20:15+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -18,300 +17,329 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr ""
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr ""
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr ""
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:204
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr ""
 
-#: ayatanawebmail/application.py:211
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr ""
 
-#: ayatanawebmail/application.py:218
-#: data/usr/share/applications/ayatana-webmail.desktop:35
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr ""
 
-#: ayatanawebmail/application.py:957
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:1110
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr ""
 
-#: ayatanawebmail/application.py:1111
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
-msgid "Unable to connect to account \"{accountName}\", the application will now exit."
+msgid ""
+"Unable to connect to account \"{accountName}\", the application will now "
+"exit."
 msgstr ""
 
-#: ayatanawebmail/application.py:1136
+#: /ayatanawebmail/application.py:1131
 #, python-format
-msgid "You have %d unread mail"
-msgid_plural "You have %d unread mails"
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ayatanawebmail/application.py:1163
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr ""
 
-#: ayatanawebmail/application.py:1165
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1167
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1180
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:60
-msgid "If this string starts with http:// or https://, the application will open it in your browser - otherwise, it will be run as a command"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:61
+msgid ""
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:90 ayatanawebmail/dialog.py:104
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:132
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:140
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:141
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:142
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:143
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:204
-msgid "Please visit the following link and enable access for less secure apps:"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:206
-msgid "Access blocked by Google"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:210
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:211
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:234
-msgid "Custom"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:242
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:244
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:286
-msgid "The application will append this string to \"Inbox\" to access a specific message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+#: /ayatanawebmail/dialog.py:276
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:288
+#: /ayatanawebmail/dialog.py:278
 msgid "Account:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:290
+#: /ayatanawebmail/dialog.py:280
 msgid "Server:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:292
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:294
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:296
+#: /ayatanawebmail/dialog.py:286
 msgid "Username:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:298
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:300
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:302
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:296
 msgid "Sent:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:308
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:310
+#: /ayatanawebmail/dialog.py:300
 msgid "Message:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:346
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:347
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:348
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:358
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:360
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:362
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:364
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:369
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:376
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:392
+#: /ayatanawebmail/dialog.py:382
 msgid "Report a bug"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:394
+#: /ayatanawebmail/dialog.py:384
 msgid "Request a feature"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:396 ayatanawebmail/dialog.py:399
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
 #, python-brace-format
 msgid "It's a good idea to add the {labelname} label to your issue."
 msgstr ""
 
-#: ayatanawebmail/dialog.py:397
+#: /ayatanawebmail/dialog.py:387
 msgid "Ask a question"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:400
+#: /ayatanawebmail/dialog.py:390
 msgid "Help translate"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:402
+#: /ayatanawebmail/dialog.py:392
 msgid "Source code"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:404
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:424
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+msgid "Enable notifications"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+msgid "Play sound when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+msgid "Hide message count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:5
-msgid "Display notifications about new mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+msgid "Run this command when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+msgid "Custom sound"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:5
-msgid "Webmail notifications and actions for any desktop"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+msgid "Play a custom sound when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:15
-msgid "Mark all as read"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+msgid "Merge messages"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:20
-msgid "Compose Mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+msgid "Merge messages belonging to the same conversation."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:25
-msgid "Sent"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+msgid "Message action"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:30
-msgid "Inbox"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+msgid "Action to perform when a message is activated."
 msgstr ""
diff --git a/po/oc.po b/po/oc.po
index 41be5ca..dcd517e 100644
--- a/po/oc.po
+++ b/po/oc.po
@@ -6,13 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/"
-"issues\n"
-"POT-Creation-Date: 2020-04-03 12:21+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: 2020-11-19 20:29+0000\n"
 "Last-Translator: Quentin PAGÈS <quentinantonin@free.fr>\n"
-"Language-Team: Occitan <https://hosted.weblate.org/projects/"
-"ayatana-indicators/ayatana-webmail/oc/>\n"
+"Language-Team: Occitan <https://hosted.weblate.org/projects/ayatana-"
+"indicators/ayatana-webmail/oc/>\n"
 "Language: oc\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,59 +20,59 @@ msgstr ""
 "X-Generator: Weblate 4.4-dev\n"
 "X-Launchpad-Export-Date: 2020-04-04 05:58+0000\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr "Seleccionar un compte"
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr "Quina comanda/pagina web volètz dobrir ?"
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr "Accions suls messatges"
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr "Suprimir"
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr "Marcar coma legit"
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr "Dobrir lo messatge/aviar una comanda"
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr "Expeditor"
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr "Subjècte"
 
-#: ayatanawebmail/application.py:205
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr "Dobrir la paga d’acuèlh del webmail"
 
-#: ayatanawebmail/application.py:212
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr "Escafar"
 
-#: ayatanawebmail/application.py:219
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr "Paramètres"
 
-#: ayatanawebmail/application.py:980
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr "Sens objècte"
 
-#: ayatanawebmail/application.py:1132
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr "Error de connexion"
 
-#: ayatanawebmail/application.py:1133
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
 msgid ""
 "Unable to connect to account \"{accountName}\", the application will now "
@@ -82,260 +81,351 @@ msgstr ""
 "Connexion impossibla al compte « {accountName} », l’aplicacion es per quitar "
 "ara."
 
-#: ayatanawebmail/application.py:1133
-#, python-brace-format
-msgid "You can run \"{command}\" to delete all your login settings."
-msgstr ""
-"Podètz executar « {command} » per suprimir totes vòstres paramètres de "
-"connexion."
-
-#: ayatanawebmail/application.py:1158
-#, python-format
-msgid "You have %d unread mail"
-msgid_plural "You have %d unread mails"
+#: /ayatanawebmail/application.py:1131
+#, fuzzy, python-format
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
 msgstr[0] "Avètz %d corrièl pas legit"
 msgstr[1] "Avètz %d corrièls pas legits"
 
-#: ayatanawebmail/application.py:1185
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr "de %(t0)s %(t1)s e d’autres"
 
-#: ayatanawebmail/application.py:1187
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr "de %(t0)s e %(t1)s"
 
-#: ayatanawebmail/application.py:1189
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr "de %s"
 
-#: ayatanawebmail/application.py:1202
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr "Corrièl novèl de %s"
 
-#: ayatanawebmail/dialog.py:60
-msgid "Web page"
-msgstr "Pagina web"
-
-#: ayatanawebmail/dialog.py:61
-msgid "Command"
-msgstr "Comanda"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
+msgstr ""
 
-#: ayatanawebmail/dialog.py:93
+#: /ayatanawebmail/dialog.py:61
 msgid ""
-"Append an additional string - you can use the $MSG_THREAD and $MSG_UID "
-"placeholders."
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
-"Ajustatz una cadena addicionala - podètz utilizar las variablas especialas $"
-"MSG_THREAD e $MSG_UID."
 
-#: ayatanawebmail/dialog.py:114 ayatanawebmail/dialog.py:128
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr "(Cap)"
 
-#: ayatanawebmail/dialog.py:156
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr "Preferéncias d'Ayatana Webmail"
 
-#: ayatanawebmail/dialog.py:164
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr "Comptes"
 
-#: ayatanawebmail/dialog.py:165
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr "Opcions"
 
-#: ayatanawebmail/dialog.py:166
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr "Assisténcia"
 
-#: ayatanawebmail/dialog.py:167
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr "A prepaus"
 
-#: ayatanawebmail/dialog.py:228
-msgid ""
-"Please visit the following link and enable access for less secure apps:"
-msgstr ""
-"Consultatz lo ligam seguent e autorizatz l’accès a las aplicacions mens "
-"seguras :"
-
-#: ayatanawebmail/dialog.py:230
-msgid "Access blocked by Google"
-msgstr "Accès blocat per Google"
-
-#: ayatanawebmail/dialog.py:234
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr "Connexion impossibla al compte. Error :"
 
-#: ayatanawebmail/dialog.py:235
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr "Fracàs de la connexion"
 
-#: ayatanawebmail/dialog.py:254
-msgid "Choose an account"
-msgstr "Causir un compte"
-
-#: ayatanawebmail/dialog.py:259
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr "Ajustar"
 
-#: ayatanawebmail/dialog.py:261
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr "Levar"
 
-#: ayatanawebmail/dialog.py:276
-msgid "Server data"
-msgstr "Donadas del servidor"
+#: /ayatanawebmail/dialog.py:276
+#, fuzzy
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+msgstr ""
+"Ajustatz una cadena addicionala - podètz utilizar las variablas especialas "
+"$MSG_THREAD e $MSG_UID."
 
-#: ayatanawebmail/dialog.py:278
-msgid "Account data"
-msgstr "Donadas del compte"
+#: /ayatanawebmail/dialog.py:278
+#, fuzzy
+msgid "Account:"
+msgstr "Comptes"
 
-#: ayatanawebmail/dialog.py:289
-msgid "Links"
-msgstr "Ligams"
+#: /ayatanawebmail/dialog.py:280
+#, fuzzy
+msgid "Server:"
+msgstr "Donadas del servidor"
 
-#: ayatanawebmail/dialog.py:297
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr "Òste :"
 
-#: ayatanawebmail/dialog.py:299
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr "Pòrt :"
 
-#: ayatanawebmail/dialog.py:302
-msgid "Login:"
-msgstr "Identificant :"
+#: /ayatanawebmail/dialog.py:286
+msgid "Username:"
+msgstr ""
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr "Senhal :"
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr "Dossièr :"
 
-#: ayatanawebmail/dialog.py:309
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr "Ostal :"
 
-#: ayatanawebmail/dialog.py:311
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr "Compausar :"
 
-#: ayatanawebmail/dialog.py:313
+#: /ayatanawebmail/dialog.py:296
+msgid "Sent:"
+msgstr "Mandat :"
+
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr "Bóstia de recepcion :"
 
-#: ayatanawebmail/dialog.py:316
-msgid "Sent:"
-msgstr "Mandat :"
+#: /ayatanawebmail/dialog.py:300
+#, fuzzy
+msgid "Message:"
+msgstr "Accions suls messatges"
 
-#: ayatanawebmail/dialog.py:354
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr "Marcar lo messatge coma legit"
 
-#: ayatanawebmail/dialog.py:355
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr "Dobrir lo navegador / Executar una comanda"
 
-#: ayatanawebmail/dialog.py:356
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr "Me demandar de qué far"
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr "Activar las notificacions :"
 
-#: ayatanawebmail/dialog.py:368
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr "Legir un son a la recepcion d’un messatge :"
 
-#: ayatanawebmail/dialog.py:370
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr "Fusionar los messatges de la meteissa conversacion :"
 
-#: ayatanawebmail/dialog.py:372
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr "Rescondre lo comptador quand val zèro :"
 
-#: ayatanawebmail/dialog.py:374
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr "Quand un messatge es seleccionat :"
 
-#: ayatanawebmail/dialog.py:377
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr "Executar aquesta comanda quand arriba un messatge :"
 
-#: ayatanawebmail/dialog.py:384
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr "Son personalizat de legir :"
 
-#: ayatanawebmail/dialog.py:400
-msgid "Report a bug/Request a feature"
+#: /ayatanawebmail/dialog.py:382
+msgid "Report a bug"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:384
+#, fuzzy
+msgid "Request a feature"
 msgstr "Senhalar una avaria / Demandar una foncionalitat"
 
-#: ayatanawebmail/dialog.py:402
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
+#, python-brace-format
+msgid "It's a good idea to add the {labelname} label to your issue."
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:387
 msgid "Ask a question"
 msgstr "Pausar una question"
 
-#: ayatanawebmail/dialog.py:404
+#: /ayatanawebmail/dialog.py:390
 msgid "Help translate"
 msgstr "Ajudar a traduire"
 
-#: ayatanawebmail/dialog.py:406
-msgid "Project page"
-msgstr "Pagina del projècte"
-
-#: ayatanawebmail/dialog.py:408
+#: /ayatanawebmail/dialog.py:392
 msgid "Source code"
 msgstr "Còdi font"
 
-#: ayatanawebmail/dialog.py:410
-msgid "Repository"
-msgstr "Depaus"
-
-#: ayatanawebmail/dialog.py:412
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr "Site web"
 
-#: ayatanawebmail/dialog.py:426
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr "Quentin PAGÈS, 2020"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
-msgstr "Corrièl Ayatana"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+#, fuzzy
+msgid "Enable notifications"
+msgstr "Activar las notificacions :"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:39
-msgid "Webmail notifications and actions for any desktop"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
 msgstr ""
-"Notificacions e accions de corrièl per quin environament de burèu que siá"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:74
-msgid "Mark all as read"
-msgstr "Tot marcar coma legit"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+#, fuzzy
+msgid "Play sound when new messages arrive."
+msgstr "Legir un son a la recepcion d’un messatge :"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+#, fuzzy
+msgid "Hide message count"
+msgstr "Dobrir lo messatge/aviar una comanda"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+#, fuzzy
+msgid "Run this command when new messages arrive."
+msgstr "Executar aquesta comanda quand arriba un messatge :"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+#, fuzzy
+msgid "Custom sound"
+msgstr "Son personalizat de legir :"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+#, fuzzy
+msgid "Play a custom sound when new messages arrive."
+msgstr "Legir un son a la recepcion d’un messatge :"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+#, fuzzy
+msgid "Merge messages"
+msgstr "Marcar lo messatge coma legit"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+#, fuzzy
+msgid "Merge messages belonging to the same conversation."
+msgstr "Fusionar los messatges de la meteissa conversacion :"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+#, fuzzy
+msgid "Message action"
+msgstr "Accions suls messatges"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+#, fuzzy
+msgid "Action to perform when a message is activated."
+msgstr "Quand un messatge es seleccionat :"
+
+#, python-brace-format
+#~ msgid "You can run \"{command}\" to delete all your login settings."
+#~ msgstr ""
+#~ "Podètz executar « {command} » per suprimir totes vòstres paramètres de "
+#~ "connexion."
+
+#~ msgid "Web page"
+#~ msgstr "Pagina web"
+
+#~ msgid "Command"
+#~ msgstr "Comanda"
+
+#~ msgid ""
+#~ "Please visit the following link and enable access for less secure apps:"
+#~ msgstr ""
+#~ "Consultatz lo ligam seguent e autorizatz l’accès a las aplicacions mens "
+#~ "seguras :"
+
+#~ msgid "Access blocked by Google"
+#~ msgstr "Accès blocat per Google"
+
+#~ msgid "Choose an account"
+#~ msgstr "Causir un compte"
+
+#~ msgid "Account data"
+#~ msgstr "Donadas del compte"
+
+#~ msgid "Links"
+#~ msgstr "Ligams"
+
+#~ msgid "Login:"
+#~ msgstr "Identificant :"
+
+#~ msgid "Project page"
+#~ msgstr "Pagina del projècte"
+
+#~ msgid "Repository"
+#~ msgstr "Depaus"
+
+#~ msgid "Ayatana Webmail"
+#~ msgstr "Corrièl Ayatana"
+
+#~ msgid "Webmail notifications and actions for any desktop"
+#~ msgstr ""
+#~ "Notificacions e accions de corrièl per quin environament de burèu que siá"
+
+#~ msgid "Mark all as read"
+#~ msgstr "Tot marcar coma legit"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:112
-msgid "Compose Mail"
-msgstr "Messatge novèl"
+#~ msgid "Compose Mail"
+#~ msgstr "Messatge novèl"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:152
-msgid "Sent"
-msgstr "Mandats"
+#~ msgid "Sent"
+#~ msgstr "Mandats"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:228
-msgid "Inbox"
-msgstr "Bóstia de recepcion"
+#~ msgid "Inbox"
+#~ msgstr "Bóstia de recepcion"
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
-msgstr "Corrièl d’Ayatana (servici)"
+#~ msgid "Ayatana Webmail (service)"
+#~ msgstr "Corrièl d’Ayatana (servici)"
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:38
-msgid "Display notifications about new mail"
-msgstr "Afichar las alèrtas de corrièls novèls"
+#~ msgid "Display notifications about new mail"
+#~ msgstr "Afichar las alèrtas de corrièls novèls"
diff --git a/po/os.po b/po/os.po
index a14391a..5642f71 100644
--- a/po/os.po
+++ b/po/os.po
@@ -6,9 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail 22.6.28\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/"
-"issues\n"
-"POT-Creation-Date: 2020-08-22 20:15+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -18,300 +17,329 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr ""
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr ""
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr ""
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:204
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr ""
 
-#: ayatanawebmail/application.py:211
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr ""
 
-#: ayatanawebmail/application.py:218
-#: data/usr/share/applications/ayatana-webmail.desktop:35
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr ""
 
-#: ayatanawebmail/application.py:957
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:1110
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr ""
 
-#: ayatanawebmail/application.py:1111
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
-msgid "Unable to connect to account \"{accountName}\", the application will now exit."
+msgid ""
+"Unable to connect to account \"{accountName}\", the application will now "
+"exit."
 msgstr ""
 
-#: ayatanawebmail/application.py:1136
+#: /ayatanawebmail/application.py:1131
 #, python-format
-msgid "You have %d unread mail"
-msgid_plural "You have %d unread mails"
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ayatanawebmail/application.py:1163
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr ""
 
-#: ayatanawebmail/application.py:1165
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1167
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1180
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:60
-msgid "If this string starts with http:// or https://, the application will open it in your browser - otherwise, it will be run as a command"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:61
+msgid ""
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:90 ayatanawebmail/dialog.py:104
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:132
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:140
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:141
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:142
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:143
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:204
-msgid "Please visit the following link and enable access for less secure apps:"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:206
-msgid "Access blocked by Google"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:210
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:211
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:234
-msgid "Custom"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:242
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:244
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:286
-msgid "The application will append this string to \"Inbox\" to access a specific message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+#: /ayatanawebmail/dialog.py:276
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:288
+#: /ayatanawebmail/dialog.py:278
 msgid "Account:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:290
+#: /ayatanawebmail/dialog.py:280
 msgid "Server:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:292
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:294
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:296
+#: /ayatanawebmail/dialog.py:286
 msgid "Username:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:298
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:300
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:302
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:296
 msgid "Sent:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:308
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:310
+#: /ayatanawebmail/dialog.py:300
 msgid "Message:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:346
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:347
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:348
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:358
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:360
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:362
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:364
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:369
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:376
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:392
+#: /ayatanawebmail/dialog.py:382
 msgid "Report a bug"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:394
+#: /ayatanawebmail/dialog.py:384
 msgid "Request a feature"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:396 ayatanawebmail/dialog.py:399
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
 #, python-brace-format
 msgid "It's a good idea to add the {labelname} label to your issue."
 msgstr ""
 
-#: ayatanawebmail/dialog.py:397
+#: /ayatanawebmail/dialog.py:387
 msgid "Ask a question"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:400
+#: /ayatanawebmail/dialog.py:390
 msgid "Help translate"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:402
+#: /ayatanawebmail/dialog.py:392
 msgid "Source code"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:404
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:424
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+msgid "Enable notifications"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+msgid "Play sound when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+msgid "Hide message count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:5
-msgid "Display notifications about new mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+msgid "Run this command when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+msgid "Custom sound"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:5
-msgid "Webmail notifications and actions for any desktop"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+msgid "Play a custom sound when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:15
-msgid "Mark all as read"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+msgid "Merge messages"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:20
-msgid "Compose Mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+msgid "Merge messages belonging to the same conversation."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:25
-msgid "Sent"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+msgid "Message action"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:30
-msgid "Inbox"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+msgid "Action to perform when a message is activated."
 msgstr ""
diff --git a/po/pa.po b/po/pa.po
index 0de0d5e..8806ae9 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -6,9 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail 22.6.28\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/"
-"issues\n"
-"POT-Creation-Date: 2020-08-22 20:15+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -18,300 +17,329 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr ""
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr ""
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr ""
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:204
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr ""
 
-#: ayatanawebmail/application.py:211
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr ""
 
-#: ayatanawebmail/application.py:218
-#: data/usr/share/applications/ayatana-webmail.desktop:35
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr ""
 
-#: ayatanawebmail/application.py:957
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:1110
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr ""
 
-#: ayatanawebmail/application.py:1111
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
-msgid "Unable to connect to account \"{accountName}\", the application will now exit."
+msgid ""
+"Unable to connect to account \"{accountName}\", the application will now "
+"exit."
 msgstr ""
 
-#: ayatanawebmail/application.py:1136
+#: /ayatanawebmail/application.py:1131
 #, python-format
-msgid "You have %d unread mail"
-msgid_plural "You have %d unread mails"
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ayatanawebmail/application.py:1163
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr ""
 
-#: ayatanawebmail/application.py:1165
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1167
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1180
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:60
-msgid "If this string starts with http:// or https://, the application will open it in your browser - otherwise, it will be run as a command"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:61
+msgid ""
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:90 ayatanawebmail/dialog.py:104
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:132
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:140
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:141
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:142
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:143
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:204
-msgid "Please visit the following link and enable access for less secure apps:"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:206
-msgid "Access blocked by Google"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:210
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:211
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:234
-msgid "Custom"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:242
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:244
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:286
-msgid "The application will append this string to \"Inbox\" to access a specific message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+#: /ayatanawebmail/dialog.py:276
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:288
+#: /ayatanawebmail/dialog.py:278
 msgid "Account:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:290
+#: /ayatanawebmail/dialog.py:280
 msgid "Server:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:292
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:294
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:296
+#: /ayatanawebmail/dialog.py:286
 msgid "Username:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:298
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:300
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:302
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:296
 msgid "Sent:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:308
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:310
+#: /ayatanawebmail/dialog.py:300
 msgid "Message:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:346
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:347
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:348
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:358
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:360
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:362
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:364
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:369
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:376
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:392
+#: /ayatanawebmail/dialog.py:382
 msgid "Report a bug"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:394
+#: /ayatanawebmail/dialog.py:384
 msgid "Request a feature"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:396 ayatanawebmail/dialog.py:399
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
 #, python-brace-format
 msgid "It's a good idea to add the {labelname} label to your issue."
 msgstr ""
 
-#: ayatanawebmail/dialog.py:397
+#: /ayatanawebmail/dialog.py:387
 msgid "Ask a question"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:400
+#: /ayatanawebmail/dialog.py:390
 msgid "Help translate"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:402
+#: /ayatanawebmail/dialog.py:392
 msgid "Source code"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:404
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:424
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+msgid "Enable notifications"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+msgid "Play sound when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+msgid "Hide message count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:5
-msgid "Display notifications about new mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+msgid "Run this command when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+msgid "Custom sound"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:5
-msgid "Webmail notifications and actions for any desktop"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+msgid "Play a custom sound when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:15
-msgid "Mark all as read"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+msgid "Merge messages"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:20
-msgid "Compose Mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+msgid "Merge messages belonging to the same conversation."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:25
-msgid "Sent"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+msgid "Message action"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:30
-msgid "Inbox"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+msgid "Action to perform when a message is activated."
 msgstr ""
diff --git a/po/pl.po b/po/pl.po
index 9bd0866..7097855 100755
--- a/po/pl.po
+++ b/po/pl.po
@@ -7,10 +7,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/issues\n"
-"POT-Creation-Date: 2020-04-03 12:21+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: 2018-06-04 07:34+0000\n"
 "Language-Team: polski <>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,313 +20,358 @@ msgstr ""
 "X-Launchpad-Export-Date: 2020-04-04 05:58+0000\n"
 "X-Generator: Launchpad (build a296f04231dee355be5db73cc878b9e21689a253)\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr ""
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr ""
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr ""
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:205
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr ""
 
-#: ayatanawebmail/application.py:212
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr ""
 
-#: ayatanawebmail/application.py:219
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr ""
 
-#: ayatanawebmail/application.py:980
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr "Brak tematu"
 
-#: ayatanawebmail/application.py:1132
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr ""
 
-#: ayatanawebmail/application.py:1133
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
 msgid ""
 "Unable to connect to account \"{accountName}\", the application will now "
 "exit."
 msgstr ""
 
-#: ayatanawebmail/application.py:1133
-#, python-brace-format
-msgid "You can run \"{command}\" to delete all your login settings."
-msgstr ""
-
-#: ayatanawebmail/application.py:1158
-#, python-format
-msgid "You have %d unread mail"
-msgid_plural "You have %d unread mails"
+#: /ayatanawebmail/application.py:1131
+#, fuzzy, python-format
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
 msgstr[0] "%d nieprzeczytana wiadomość"
 msgstr[1] "%d nieprzeczytane wiadomości"
 msgstr[2] "%d nieprzeczytanych wiadomości"
 
-#: ayatanawebmail/application.py:1185
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr "od %(t0)s, %(t1)s i innych nadawców"
 
-#: ayatanawebmail/application.py:1187
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr "od %(t0)s i %(t1)s"
 
-#: ayatanawebmail/application.py:1189
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr "od %s"
 
-#: ayatanawebmail/application.py:1202
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr "Nowa wiadomość od %s"
 
-#: ayatanawebmail/dialog.py:60
-msgid "Web page"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:61
-msgid "Command"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:93
+#: /ayatanawebmail/dialog.py:61
 msgid ""
-"Append an additional string - you can use the $MSG_THREAD and $MSG_UID "
-"placeholders."
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:114 ayatanawebmail/dialog.py:128
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:156
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr "Preferencje"
 
-#: ayatanawebmail/dialog.py:164
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr "Konta"
 
-#: ayatanawebmail/dialog.py:165
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr "Opcje"
 
-#: ayatanawebmail/dialog.py:166
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:167
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:228
-msgid ""
-"Please visit the following link and enable access for less secure apps:"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:230
-msgid "Access blocked by Google"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:234
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:235
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:254
-msgid "Choose an account"
-msgstr "Konto"
-
-#: ayatanawebmail/dialog.py:259
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:261
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:276
-msgid "Server data"
-msgstr "Dane serwera"
+#: /ayatanawebmail/dialog.py:276
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+msgstr ""
 
-#: ayatanawebmail/dialog.py:278
-msgid "Account data"
-msgstr "Dane konta"
+#: /ayatanawebmail/dialog.py:278
+#, fuzzy
+msgid "Account:"
+msgstr "Konta"
 
-#: ayatanawebmail/dialog.py:289
-msgid "Links"
-msgstr ""
+#: /ayatanawebmail/dialog.py:280
+#, fuzzy
+msgid "Server:"
+msgstr "Dane serwera"
 
-#: ayatanawebmail/dialog.py:297
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr "Serwer:"
 
-#: ayatanawebmail/dialog.py:299
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr "Port:"
 
-#: ayatanawebmail/dialog.py:302
-msgid "Login:"
-msgstr "Nazwa użytkownika:"
+#: /ayatanawebmail/dialog.py:286
+msgid "Username:"
+msgstr ""
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr "Hasło:"
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:309
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr "Strona główna:"
 
-#: ayatanawebmail/dialog.py:311
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr "Tworzenie wiadomości:"
 
-#: ayatanawebmail/dialog.py:313
+#: /ayatanawebmail/dialog.py:296
+msgid "Sent:"
+msgstr "Wysłane:"
+
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr "Odebrane:"
 
-#: ayatanawebmail/dialog.py:316
-msgid "Sent:"
-msgstr "Wysłane:"
+#: /ayatanawebmail/dialog.py:300
+msgid "Message:"
+msgstr ""
 
-#: ayatanawebmail/dialog.py:354
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:355
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:356
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr "Powiadomienia"
 
-#: ayatanawebmail/dialog.py:368
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:370
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:372
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:374
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:377
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:384
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr "Wybrany dźwięk"
 
-#: ayatanawebmail/dialog.py:400
-msgid "Report a bug/Request a feature"
+#: /ayatanawebmail/dialog.py:382
+msgid "Report a bug"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:402
-msgid "Ask a question"
+#: /ayatanawebmail/dialog.py:384
+msgid "Request a feature"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:404
-msgid "Help translate"
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
+#, python-brace-format
+msgid "It's a good idea to add the {labelname} label to your issue."
 msgstr ""
 
-#: ayatanawebmail/dialog.py:406
-msgid "Project page"
+#: /ayatanawebmail/dialog.py:387
+msgid "Ask a question"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:408
-msgid "Source code"
+#: /ayatanawebmail/dialog.py:390
+msgid "Help translate"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:410
-msgid "Repository"
+#: /ayatanawebmail/dialog.py:392
+msgid "Source code"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:412
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:426
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+#, fuzzy
+msgid "Enable notifications"
+msgstr "Powiadomienia"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+msgid "Play sound when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+msgid "Hide message count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:39
-msgid "Webmail notifications and actions for any desktop"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:74
-msgid "Mark all as read"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+msgid "Run this command when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:112
-msgid "Compose Mail"
-msgstr "Utwórz wiadomość"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+#, fuzzy
+msgid "Custom sound"
+msgstr "Wybrany dźwięk"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+msgid "Play a custom sound when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+msgid "Merge messages"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+msgid "Merge messages belonging to the same conversation."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+msgid "Message action"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+msgid "Action to perform when a message is activated."
+msgstr ""
+
+#~ msgid "Choose an account"
+#~ msgstr "Konto"
+
+#~ msgid "Account data"
+#~ msgstr "Dane konta"
+
+#~ msgid "Login:"
+#~ msgstr "Nazwa użytkownika:"
+
+#~ msgid "Compose Mail"
+#~ msgstr "Utwórz wiadomość"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:152
-msgid "Sent"
-msgstr "Wysłane"
+#~ msgid "Sent"
+#~ msgstr "Wysłane"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:228
-msgid "Inbox"
-msgstr "Odebrane"
+#~ msgid "Inbox"
+#~ msgstr "Odebrane"
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
-msgstr "Klient poczty Ayatana Webmail (usługa)"
+#~ msgid "Ayatana Webmail (service)"
+#~ msgstr "Klient poczty Ayatana Webmail (usługa)"
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:38
-msgid "Display notifications about new mail"
-msgstr "Wyświetla powiadomienia o nowych wiadomościach"
+#~ msgid "Display notifications about new mail"
+#~ msgstr "Wyświetla powiadomienia o nowych wiadomościach"
diff --git a/po/ps.po b/po/ps.po
index f979b98..ec2af27 100644
--- a/po/ps.po
+++ b/po/ps.po
@@ -6,9 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail 22.6.28\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/"
-"issues\n"
-"POT-Creation-Date: 2020-08-22 20:15+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -18,300 +17,329 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr ""
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr ""
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr ""
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:204
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr ""
 
-#: ayatanawebmail/application.py:211
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr ""
 
-#: ayatanawebmail/application.py:218
-#: data/usr/share/applications/ayatana-webmail.desktop:35
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr ""
 
-#: ayatanawebmail/application.py:957
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:1110
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr ""
 
-#: ayatanawebmail/application.py:1111
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
-msgid "Unable to connect to account \"{accountName}\", the application will now exit."
+msgid ""
+"Unable to connect to account \"{accountName}\", the application will now "
+"exit."
 msgstr ""
 
-#: ayatanawebmail/application.py:1136
+#: /ayatanawebmail/application.py:1131
 #, python-format
-msgid "You have %d unread mail"
-msgid_plural "You have %d unread mails"
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ayatanawebmail/application.py:1163
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr ""
 
-#: ayatanawebmail/application.py:1165
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1167
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1180
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:60
-msgid "If this string starts with http:// or https://, the application will open it in your browser - otherwise, it will be run as a command"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:61
+msgid ""
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:90 ayatanawebmail/dialog.py:104
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:132
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:140
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:141
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:142
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:143
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:204
-msgid "Please visit the following link and enable access for less secure apps:"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:206
-msgid "Access blocked by Google"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:210
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:211
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:234
-msgid "Custom"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:242
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:244
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:286
-msgid "The application will append this string to \"Inbox\" to access a specific message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+#: /ayatanawebmail/dialog.py:276
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:288
+#: /ayatanawebmail/dialog.py:278
 msgid "Account:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:290
+#: /ayatanawebmail/dialog.py:280
 msgid "Server:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:292
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:294
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:296
+#: /ayatanawebmail/dialog.py:286
 msgid "Username:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:298
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:300
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:302
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:296
 msgid "Sent:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:308
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:310
+#: /ayatanawebmail/dialog.py:300
 msgid "Message:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:346
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:347
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:348
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:358
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:360
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:362
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:364
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:369
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:376
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:392
+#: /ayatanawebmail/dialog.py:382
 msgid "Report a bug"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:394
+#: /ayatanawebmail/dialog.py:384
 msgid "Request a feature"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:396 ayatanawebmail/dialog.py:399
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
 #, python-brace-format
 msgid "It's a good idea to add the {labelname} label to your issue."
 msgstr ""
 
-#: ayatanawebmail/dialog.py:397
+#: /ayatanawebmail/dialog.py:387
 msgid "Ask a question"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:400
+#: /ayatanawebmail/dialog.py:390
 msgid "Help translate"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:402
+#: /ayatanawebmail/dialog.py:392
 msgid "Source code"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:404
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:424
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+msgid "Enable notifications"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+msgid "Play sound when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+msgid "Hide message count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:5
-msgid "Display notifications about new mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+msgid "Run this command when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+msgid "Custom sound"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:5
-msgid "Webmail notifications and actions for any desktop"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+msgid "Play a custom sound when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:15
-msgid "Mark all as read"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+msgid "Merge messages"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:20
-msgid "Compose Mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+msgid "Merge messages belonging to the same conversation."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:25
-msgid "Sent"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+msgid "Message action"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:30
-msgid "Inbox"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+msgid "Action to perform when a message is activated."
 msgstr ""
diff --git a/po/pt.po b/po/pt.po
index ba46e0a..cb7bdb2 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -6,13 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/"
-"issues\n"
-"POT-Creation-Date: 2020-04-03 12:21+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: 2022-01-03 09:53+0000\n"
 "Last-Translator: ssantos <ssantos@web.de>\n"
-"Language-Team: Portuguese <https://hosted.weblate.org/projects/"
-"ayatana-indicators/ayatana-webmail/pt/>\n"
+"Language-Team: Portuguese <https://hosted.weblate.org/projects/ayatana-"
+"indicators/ayatana-webmail/pt/>\n"
 "Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,59 +20,59 @@ msgstr ""
 "X-Generator: Weblate 4.10.1\n"
 "X-Launchpad-Export-Date: 2020-04-04 05:58+0000\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr "Selecione a conta"
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr "Qual a página do comando/web da conta que gostaria de abrir?"
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr "Ações das mensagens"
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr "Excluir"
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr "Marque como lido"
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr "Abra a mensagem/Execute o comando"
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr "Remetente"
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr "Assunto"
 
-#: ayatanawebmail/application.py:205
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr "Abra a página inicial do webmail"
 
-#: ayatanawebmail/application.py:212
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr "Remover"
 
-#: ayatanawebmail/application.py:219
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr "Configurações"
 
-#: ayatanawebmail/application.py:980
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr "Sem assunto"
 
-#: ayatanawebmail/application.py:1132
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr "Erro de conexão"
 
-#: ayatanawebmail/application.py:1133
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
 msgid ""
 "Unable to connect to account \"{accountName}\", the application will now "
@@ -82,253 +81,324 @@ msgstr ""
 "Não foi possível conectar-se à conta \"{accountName}\", a aplicação será "
 "encerrada."
 
-#: ayatanawebmail/application.py:1133
-#, python-brace-format
-msgid "You can run \"{command}\" to delete all your login settings."
-msgstr ""
-
-#: ayatanawebmail/application.py:1158
-#, python-format
-msgid "You have %d unread mail"
-msgid_plural "You have %d unread mails"
+#: /ayatanawebmail/application.py:1131
+#, fuzzy, python-format
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
 msgstr[0] "Você tem %d e-mail não lido"
 msgstr[1] "Você tem %d e-mails não lidos"
 
-#: ayatanawebmail/application.py:1185
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr "de %(t0)s, %(t1)s e outros"
 
-#: ayatanawebmail/application.py:1187
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr "de %(t0)s e %(t1)s"
 
-#: ayatanawebmail/application.py:1189
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr "de %s"
 
-#: ayatanawebmail/application.py:1202
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr "Novo e-mail de %s"
 
-#: ayatanawebmail/dialog.py:60
-msgid "Web page"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:61
-msgid "Command"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:93
+#: /ayatanawebmail/dialog.py:61
 msgid ""
-"Append an additional string - you can use the $MSG_THREAD and $MSG_UID "
-"placeholders."
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:114 ayatanawebmail/dialog.py:128
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr "(Nenhum)"
 
-#: ayatanawebmail/dialog.py:156
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr "Preferências do Ayatana Webmail"
 
-#: ayatanawebmail/dialog.py:164
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr "Contas"
 
-#: ayatanawebmail/dialog.py:165
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr "Preferências"
 
-#: ayatanawebmail/dialog.py:166
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr "Suporte"
 
-#: ayatanawebmail/dialog.py:167
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr "Sobre"
 
-#: ayatanawebmail/dialog.py:228
-msgid ""
-"Please visit the following link and enable access for less secure apps:"
-msgstr "Visite a ligação a seguir e ative o acesso às apps menos seguras:"
-
-#: ayatanawebmail/dialog.py:230
-msgid "Access blocked by Google"
-msgstr "Acesso bloqueado pelo Google"
-
-#: ayatanawebmail/dialog.py:234
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
-msgstr "Houve uma falha ao se conectar à conta de e-mail. O erro retornado foi:"
+msgstr ""
+"Houve uma falha ao se conectar à conta de e-mail. O erro retornado foi:"
 
-#: ayatanawebmail/dialog.py:235
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr "Falha na conexão"
 
-#: ayatanawebmail/dialog.py:254
-msgid "Choose an account"
-msgstr "Escolhe uma conta"
-
-#: ayatanawebmail/dialog.py:259
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr "Adicione"
 
-#: ayatanawebmail/dialog.py:261
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr "Remova"
 
-#: ayatanawebmail/dialog.py:276
-msgid "Server data"
-msgstr "Dados do servidor"
+#: /ayatanawebmail/dialog.py:276
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+msgstr ""
 
-#: ayatanawebmail/dialog.py:278
-msgid "Account data"
-msgstr "Dados da conta"
+#: /ayatanawebmail/dialog.py:278
+#, fuzzy
+msgid "Account:"
+msgstr "Contas"
 
-#: ayatanawebmail/dialog.py:289
-msgid "Links"
-msgstr ""
+#: /ayatanawebmail/dialog.py:280
+#, fuzzy
+msgid "Server:"
+msgstr "Dados do servidor"
 
-#: ayatanawebmail/dialog.py:297
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr "Servidor:"
 
-#: ayatanawebmail/dialog.py:299
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr "Porta:"
 
-#: ayatanawebmail/dialog.py:302
-msgid "Login:"
-msgstr "Utilizador:"
+#: /ayatanawebmail/dialog.py:286
+msgid "Username:"
+msgstr ""
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr "Palavra-passe:"
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr "Pastas:"
 
-#: ayatanawebmail/dialog.py:309
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr "Pasta pessoal:"
 
-#: ayatanawebmail/dialog.py:311
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr "Compor mensagem:"
 
-#: ayatanawebmail/dialog.py:313
+#: /ayatanawebmail/dialog.py:296
+msgid "Sent:"
+msgstr "Enviado:"
+
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr "Caixa de entrada:"
 
-#: ayatanawebmail/dialog.py:316
-msgid "Sent:"
-msgstr "Enviado:"
+#: /ayatanawebmail/dialog.py:300
+#, fuzzy
+msgid "Message:"
+msgstr "Ações das mensagens"
 
-#: ayatanawebmail/dialog.py:354
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr "Marque a mensagem como lida"
 
-#: ayatanawebmail/dialog.py:355
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr "Abra a mensagem no navegador/Execute o comando"
 
-#: ayatanawebmail/dialog.py:356
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr "Me pergunte o que fazer"
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr "Ativar notificações:"
 
-#: ayatanawebmail/dialog.py:368
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr "Toque um som quando uma mensagem for recebida:"
 
-#: ayatanawebmail/dialog.py:370
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr "Mescle as mensagens da mesma conversa:"
 
-#: ayatanawebmail/dialog.py:372
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr "Oculte a contagem quando for zero:"
 
-#: ayatanawebmail/dialog.py:374
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr "Quando uma mensagem está ativada:"
 
-#: ayatanawebmail/dialog.py:377
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr "Execute este comando quando uma mensagem for recebida:"
 
-#: ayatanawebmail/dialog.py:384
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr "Som a tocar:"
 
-#: ayatanawebmail/dialog.py:400
-msgid "Report a bug/Request a feature"
+#: /ayatanawebmail/dialog.py:382
+msgid "Report a bug"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:384
+msgid "Request a feature"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:402
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
+#, python-brace-format
+msgid "It's a good idea to add the {labelname} label to your issue."
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:387
 msgid "Ask a question"
 msgstr "Faça uma pergunta"
 
-#: ayatanawebmail/dialog.py:404
+#: /ayatanawebmail/dialog.py:390
 msgid "Help translate"
 msgstr "Ajude a traduzir"
 
-#: ayatanawebmail/dialog.py:406
-msgid "Project page"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:408
+#: /ayatanawebmail/dialog.py:392
 msgid "Source code"
 msgstr "Código fonte"
 
-#: ayatanawebmail/dialog.py:410
-msgid "Repository"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:412
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr "Página inicial"
 
-#: ayatanawebmail/dialog.py:426
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr "créditos da tradução"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
-msgstr "Ayatana Webmail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+#, fuzzy
+msgid "Enable notifications"
+msgstr "Ativar notificações:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+#, fuzzy
+msgid "Play sound when new messages arrive."
+msgstr "Toque um som quando uma mensagem for recebida:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+#, fuzzy
+msgid "Hide message count"
+msgstr "Abra a mensagem/Execute o comando"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+#, fuzzy
+msgid "Run this command when new messages arrive."
+msgstr "Execute este comando quando uma mensagem for recebida:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+#, fuzzy
+msgid "Custom sound"
+msgstr "Som a tocar:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+#, fuzzy
+msgid "Play a custom sound when new messages arrive."
+msgstr "Toque um som quando uma mensagem for recebida:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+#, fuzzy
+msgid "Merge messages"
+msgstr "Marque a mensagem como lida"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+#, fuzzy
+msgid "Merge messages belonging to the same conversation."
+msgstr "Mescle as mensagens da mesma conversa:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+#, fuzzy
+msgid "Message action"
+msgstr "Ações das mensagens"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+#, fuzzy
+msgid "Action to perform when a message is activated."
+msgstr "Quando uma mensagem está ativada:"
+
+#~ msgid ""
+#~ "Please visit the following link and enable access for less secure apps:"
+#~ msgstr "Visite a ligação a seguir e ative o acesso às apps menos seguras:"
+
+#~ msgid "Access blocked by Google"
+#~ msgstr "Acesso bloqueado pelo Google"
+
+#~ msgid "Choose an account"
+#~ msgstr "Escolhe uma conta"
+
+#~ msgid "Account data"
+#~ msgstr "Dados da conta"
+
+#~ msgid "Login:"
+#~ msgstr "Utilizador:"
+
+#~ msgid "Ayatana Webmail"
+#~ msgstr "Ayatana Webmail"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:39
-msgid "Webmail notifications and actions for any desktop"
-msgstr "As notificações e as ações do Webmail para qualquer desktop"
+#~ msgid "Webmail notifications and actions for any desktop"
+#~ msgstr "As notificações e as ações do Webmail para qualquer desktop"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:74
-msgid "Mark all as read"
-msgstr "Marque tudo como lido"
+#~ msgid "Mark all as read"
+#~ msgstr "Marque tudo como lido"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:112
-msgid "Compose Mail"
-msgstr "Compor Mensagem"
+#~ msgid "Compose Mail"
+#~ msgstr "Compor Mensagem"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:152
-msgid "Sent"
-msgstr "Enviado"
+#~ msgid "Sent"
+#~ msgstr "Enviado"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:228
-msgid "Inbox"
-msgstr "Caixa de entrada"
+#~ msgid "Inbox"
+#~ msgstr "Caixa de entrada"
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
-msgstr "Ayatana Webmail (serviço)"
+#~ msgid "Ayatana Webmail (service)"
+#~ msgstr "Ayatana Webmail (serviço)"
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:38
-msgid "Display notifications about new mail"
-msgstr "Mostrar notificações sobre novos mails"
+#~ msgid "Display notifications about new mail"
+#~ msgstr "Mostrar notificações sobre novos mails"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index e20b75e..5da894c 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -6,9 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/"
-"issues\n"
-"POT-Creation-Date: 2020-04-03 12:21+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: 2021-09-24 14:40+0000\n"
 "Last-Translator: Wellington Terumi Uemura <wellingtonuemura@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) <https://hosted.weblate.org/projects/"
@@ -21,59 +20,59 @@ msgstr ""
 "X-Generator: Weblate 4.9-dev\n"
 "X-Launchpad-Export-Date: 2020-04-04 05:58+0000\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr "Selecione a conta"
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr "Qual a página do comando/web da conta que você gostaria de abrir?"
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr "Ações das mensagens"
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr "Excluir"
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr "Marque como lido"
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr "Abra a mensagem/Execute o comando"
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr "Remetente"
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr "Assunto"
 
-#: ayatanawebmail/application.py:205
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr "Abra a página inicial do webmail"
 
-#: ayatanawebmail/application.py:212
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr "Remover"
 
-#: ayatanawebmail/application.py:219
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr "Configurações"
 
-#: ayatanawebmail/application.py:980
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr "Sem assunto"
 
-#: ayatanawebmail/application.py:1132
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr "Erro de conexão"
 
-#: ayatanawebmail/application.py:1133
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
 msgid ""
 "Unable to connect to account \"{accountName}\", the application will now "
@@ -82,258 +81,340 @@ msgstr ""
 "Não foi possível conectar-se à conta \"{accountName}\", o aplicativo será "
 "encerrado."
 
-#: ayatanawebmail/application.py:1133
-#, python-brace-format
-msgid "You can run \"{command}\" to delete all your login settings."
-msgstr ""
-"Você pode executar \"{command}\" para excluir todas as suas configurações de "
-"login."
-
-#: ayatanawebmail/application.py:1158
-#, python-format
-msgid "You have %d unread mail"
-msgid_plural "You have %d unread mails"
+#: /ayatanawebmail/application.py:1131
+#, fuzzy, python-format
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
 msgstr[0] "Você tem %d e-mail não lido"
 msgstr[1] "Você tem %d e-mails não lidos"
 
-#: ayatanawebmail/application.py:1185
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr "de %(t0)s, %(t1)s e outros"
 
-#: ayatanawebmail/application.py:1187
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr "de %(t0)s e %(t1)s"
 
-#: ayatanawebmail/application.py:1189
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr "de %s"
 
-#: ayatanawebmail/application.py:1202
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr "Novo email de %s"
 
-#: ayatanawebmail/dialog.py:60
-msgid "Web page"
-msgstr "Página Web"
-
-#: ayatanawebmail/dialog.py:61
-msgid "Command"
-msgstr "Comando"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
+msgstr ""
 
-#: ayatanawebmail/dialog.py:93
+#: /ayatanawebmail/dialog.py:61
 msgid ""
-"Append an additional string - you can use the $MSG_THREAD and $MSG_UID "
-"placeholders."
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
-"Anexe um string adicional - você pode usar os marcadores $MSG_THREAD e "
-"$MSG_UID."
 
-#: ayatanawebmail/dialog.py:114 ayatanawebmail/dialog.py:128
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr "(Nenhum)"
 
-#: ayatanawebmail/dialog.py:156
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr "Preferências do Ayatana Webmail"
 
-#: ayatanawebmail/dialog.py:164
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr "Contas"
 
-#: ayatanawebmail/dialog.py:165
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr "Preferências"
 
-#: ayatanawebmail/dialog.py:166
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr "Suporte"
 
-#: ayatanawebmail/dialog.py:167
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr "Sobre"
 
-#: ayatanawebmail/dialog.py:228
-msgid ""
-"Please visit the following link and enable access for less secure apps:"
-msgstr ""
-"Visite o link a seguir e ative o acesso para os aplicativos menos seguros:"
-
-#: ayatanawebmail/dialog.py:230
-msgid "Access blocked by Google"
-msgstr "Acesso bloqueado pelo Google"
-
-#: ayatanawebmail/dialog.py:234
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
-msgstr "Houve uma falha ao se conectar à conta de e-mail. O erro retornado foi:"
+msgstr ""
+"Houve uma falha ao se conectar à conta de e-mail. O erro retornado foi:"
 
-#: ayatanawebmail/dialog.py:235
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr "Falha na conexão"
 
-#: ayatanawebmail/dialog.py:254
-msgid "Choose an account"
-msgstr "Escolha uma conta"
-
-#: ayatanawebmail/dialog.py:259
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr "Adicione"
 
-#: ayatanawebmail/dialog.py:261
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr "Remova"
 
-#: ayatanawebmail/dialog.py:276
-msgid "Server data"
-msgstr "Dados do servidor"
+#: /ayatanawebmail/dialog.py:276
+#, fuzzy
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+msgstr ""
+"Anexe um string adicional - você pode usar os marcadores $MSG_THREAD e "
+"$MSG_UID."
 
-#: ayatanawebmail/dialog.py:278
-msgid "Account data"
-msgstr "Dados da conta"
+#: /ayatanawebmail/dialog.py:278
+#, fuzzy
+msgid "Account:"
+msgstr "Contas"
 
-#: ayatanawebmail/dialog.py:289
-msgid "Links"
-msgstr ""
+#: /ayatanawebmail/dialog.py:280
+#, fuzzy
+msgid "Server:"
+msgstr "Dados do servidor"
 
-#: ayatanawebmail/dialog.py:297
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr "Servidor:"
 
-#: ayatanawebmail/dialog.py:299
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr "Porta:"
 
-#: ayatanawebmail/dialog.py:302
-msgid "Login:"
-msgstr "Login:"
+#: /ayatanawebmail/dialog.py:286
+msgid "Username:"
+msgstr ""
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr "Senha:"
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr "Pastas:"
 
-#: ayatanawebmail/dialog.py:309
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr "Pessoal:"
 
-#: ayatanawebmail/dialog.py:311
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr "Redigir:"
 
-#: ayatanawebmail/dialog.py:313
+#: /ayatanawebmail/dialog.py:296
+msgid "Sent:"
+msgstr "Enviados:"
+
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr "Caixa de entrada:"
 
-#: ayatanawebmail/dialog.py:316
-msgid "Sent:"
-msgstr "Enviados:"
+#: /ayatanawebmail/dialog.py:300
+#, fuzzy
+msgid "Message:"
+msgstr "Ações das mensagens"
 
-#: ayatanawebmail/dialog.py:354
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr "Marque a mensagem como lida"
 
-#: ayatanawebmail/dialog.py:355
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr "Abra a mensagem no navegador/Execute o comando"
 
-#: ayatanawebmail/dialog.py:356
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr "Me pergunte o que fazer"
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr "Ative as notificações:"
 
-#: ayatanawebmail/dialog.py:368
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr "Toque um som quando uma mensagem for recebida:"
 
-#: ayatanawebmail/dialog.py:370
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr "Mescle as mensagens da mesma conversa:"
 
-#: ayatanawebmail/dialog.py:372
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr "Oculte a contagem quando for zero:"
 
-#: ayatanawebmail/dialog.py:374
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr "Quando uma mensagem está ativada:"
 
-#: ayatanawebmail/dialog.py:377
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr "Execute este comando quando uma mensagem for recebida:"
 
-#: ayatanawebmail/dialog.py:384
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr "Som personalizado para tocar:"
 
-#: ayatanawebmail/dialog.py:400
-msgid "Report a bug/Request a feature"
+#: /ayatanawebmail/dialog.py:382
+msgid "Report a bug"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:384
+msgid "Request a feature"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:402
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
+#, python-brace-format
+msgid "It's a good idea to add the {labelname} label to your issue."
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:387
 msgid "Ask a question"
 msgstr "Faça uma pergunta"
 
-#: ayatanawebmail/dialog.py:404
+#: /ayatanawebmail/dialog.py:390
 msgid "Help translate"
 msgstr "Ajude a traduzir"
 
-#: ayatanawebmail/dialog.py:406
-msgid "Project page"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:408
+#: /ayatanawebmail/dialog.py:392
 msgid "Source code"
 msgstr "Código fonte"
 
-#: ayatanawebmail/dialog.py:410
-msgid "Repository"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:412
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr "Página inicial"
 
-#: ayatanawebmail/dialog.py:426
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr "créditos da tradução"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
-msgstr "Ayatana Webmail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+#, fuzzy
+msgid "Enable notifications"
+msgstr "Ative as notificações:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+#, fuzzy
+msgid "Play sound when new messages arrive."
+msgstr "Toque um som quando uma mensagem for recebida:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+#, fuzzy
+msgid "Hide message count"
+msgstr "Abra a mensagem/Execute o comando"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+#, fuzzy
+msgid "Run this command when new messages arrive."
+msgstr "Execute este comando quando uma mensagem for recebida:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+#, fuzzy
+msgid "Custom sound"
+msgstr "Som personalizado para tocar:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+#, fuzzy
+msgid "Play a custom sound when new messages arrive."
+msgstr "Toque um som quando uma mensagem for recebida:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+#, fuzzy
+msgid "Merge messages"
+msgstr "Marque a mensagem como lida"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+#, fuzzy
+msgid "Merge messages belonging to the same conversation."
+msgstr "Mescle as mensagens da mesma conversa:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+#, fuzzy
+msgid "Message action"
+msgstr "Ações das mensagens"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+#, fuzzy
+msgid "Action to perform when a message is activated."
+msgstr "Quando uma mensagem está ativada:"
+
+#, python-brace-format
+#~ msgid "You can run \"{command}\" to delete all your login settings."
+#~ msgstr ""
+#~ "Você pode executar \"{command}\" para excluir todas as suas configurações "
+#~ "de login."
+
+#~ msgid "Web page"
+#~ msgstr "Página Web"
+
+#~ msgid "Command"
+#~ msgstr "Comando"
+
+#~ msgid ""
+#~ "Please visit the following link and enable access for less secure apps:"
+#~ msgstr ""
+#~ "Visite o link a seguir e ative o acesso para os aplicativos menos seguros:"
+
+#~ msgid "Access blocked by Google"
+#~ msgstr "Acesso bloqueado pelo Google"
+
+#~ msgid "Choose an account"
+#~ msgstr "Escolha uma conta"
+
+#~ msgid "Account data"
+#~ msgstr "Dados da conta"
+
+#~ msgid "Login:"
+#~ msgstr "Login:"
+
+#~ msgid "Ayatana Webmail"
+#~ msgstr "Ayatana Webmail"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:39
-msgid "Webmail notifications and actions for any desktop"
-msgstr "As notificações e as ações do Webmail para qualquer desktop"
+#~ msgid "Webmail notifications and actions for any desktop"
+#~ msgstr "As notificações e as ações do Webmail para qualquer desktop"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:74
-msgid "Mark all as read"
-msgstr "Marque tudo como lido"
+#~ msgid "Mark all as read"
+#~ msgstr "Marque tudo como lido"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:112
-msgid "Compose Mail"
-msgstr "Redigir email"
+#~ msgid "Compose Mail"
+#~ msgstr "Redigir email"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:152
-msgid "Sent"
-msgstr "Enviadas"
+#~ msgid "Sent"
+#~ msgstr "Enviadas"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:228
-msgid "Inbox"
-msgstr "Caixa de entrada"
+#~ msgid "Inbox"
+#~ msgstr "Caixa de entrada"
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
-msgstr "Ayatana Webmail (serviço)"
+#~ msgid "Ayatana Webmail (service)"
+#~ msgstr "Ayatana Webmail (serviço)"
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:38
-msgid "Display notifications about new mail"
-msgstr "Mostrar notificações sobre novos e-mails"
+#~ msgid "Display notifications about new mail"
+#~ msgstr "Mostrar notificações sobre novos e-mails"
diff --git a/po/ro.po b/po/ro.po
index 9440868..3f51bb8 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -6,9 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail 22.6.28\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/"
-"issues\n"
-"POT-Creation-Date: 2020-08-22 20:15+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -19,301 +18,330 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
 "20)) ? 1 : 2;\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr ""
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr ""
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr ""
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:204
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr ""
 
-#: ayatanawebmail/application.py:211
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr ""
 
-#: ayatanawebmail/application.py:218
-#: data/usr/share/applications/ayatana-webmail.desktop:35
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr ""
 
-#: ayatanawebmail/application.py:957
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:1110
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr ""
 
-#: ayatanawebmail/application.py:1111
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
-msgid "Unable to connect to account \"{accountName}\", the application will now exit."
+msgid ""
+"Unable to connect to account \"{accountName}\", the application will now "
+"exit."
 msgstr ""
 
-#: ayatanawebmail/application.py:1136
+#: /ayatanawebmail/application.py:1131
 #, python-format
-msgid "You have %d unread mail"
-msgid_plural "You have %d unread mails"
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: ayatanawebmail/application.py:1163
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr ""
 
-#: ayatanawebmail/application.py:1165
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1167
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1180
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:60
-msgid "If this string starts with http:// or https://, the application will open it in your browser - otherwise, it will be run as a command"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:61
+msgid ""
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:90 ayatanawebmail/dialog.py:104
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:132
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:140
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:141
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:142
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:143
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:204
-msgid "Please visit the following link and enable access for less secure apps:"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:206
-msgid "Access blocked by Google"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:210
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:211
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:234
-msgid "Custom"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:242
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:244
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:286
-msgid "The application will append this string to \"Inbox\" to access a specific message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+#: /ayatanawebmail/dialog.py:276
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:288
+#: /ayatanawebmail/dialog.py:278
 msgid "Account:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:290
+#: /ayatanawebmail/dialog.py:280
 msgid "Server:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:292
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:294
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:296
+#: /ayatanawebmail/dialog.py:286
 msgid "Username:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:298
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:300
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:302
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:296
 msgid "Sent:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:308
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:310
+#: /ayatanawebmail/dialog.py:300
 msgid "Message:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:346
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:347
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:348
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:358
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:360
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:362
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:364
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:369
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:376
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:392
+#: /ayatanawebmail/dialog.py:382
 msgid "Report a bug"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:394
+#: /ayatanawebmail/dialog.py:384
 msgid "Request a feature"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:396 ayatanawebmail/dialog.py:399
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
 #, python-brace-format
 msgid "It's a good idea to add the {labelname} label to your issue."
 msgstr ""
 
-#: ayatanawebmail/dialog.py:397
+#: /ayatanawebmail/dialog.py:387
 msgid "Ask a question"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:400
+#: /ayatanawebmail/dialog.py:390
 msgid "Help translate"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:402
+#: /ayatanawebmail/dialog.py:392
 msgid "Source code"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:404
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:424
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+msgid "Enable notifications"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+msgid "Play sound when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+msgid "Hide message count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:5
-msgid "Display notifications about new mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+msgid "Run this command when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+msgid "Custom sound"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:5
-msgid "Webmail notifications and actions for any desktop"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+msgid "Play a custom sound when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:15
-msgid "Mark all as read"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+msgid "Merge messages"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:20
-msgid "Compose Mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+msgid "Merge messages belonging to the same conversation."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:25
-msgid "Sent"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+msgid "Message action"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:30
-msgid "Inbox"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+msgid "Action to perform when a message is activated."
 msgstr ""
diff --git a/po/ru.po b/po/ru.po
index c5ce184..a3abfd7 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -6,13 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/"
-"issues\n"
-"POT-Creation-Date: 2020-04-03 12:21+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: 2020-10-09 11:26+0000\n"
 "Last-Translator: koffevar <egor.kafisov@gmail.com>\n"
-"Language-Team: Russian <https://hosted.weblate.org/projects/"
-"ayatana-indicators/ayatana-webmail/ru/>\n"
+"Language-Team: Russian <https://hosted.weblate.org/projects/ayatana-"
+"indicators/ayatana-webmail/ru/>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,59 +21,59 @@ msgstr ""
 "X-Generator: Weblate 4.3-dev\n"
 "X-Launchpad-Export-Date: 2020-04-04 05:58+0000\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr "Выберите учетную запись"
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr "Чью команду/веб-страницу Вы хотели бы открыть?"
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr "Взаимодействие с письмом"
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr "Удалить"
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr "Пометить как прочитанное"
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr "Открыть сообщение/Выполнить команду"
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr "Отправитель"
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr "Тема"
 
-#: ayatanawebmail/application.py:205
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr "Открыть домашнюю страницу веб-почты"
 
-#: ayatanawebmail/application.py:212
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr "Очистить"
 
-#: ayatanawebmail/application.py:219
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr "Настройки"
 
-#: ayatanawebmail/application.py:980
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr "Без темы"
 
-#: ayatanawebmail/application.py:1132
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr "Ошибка соединения"
 
-#: ayatanawebmail/application.py:1133
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
 msgid ""
 "Unable to connect to account \"{accountName}\", the application will now "
@@ -83,260 +82,351 @@ msgstr ""
 "Не удается подключиться к учетной записи \"{accountName}\", приложение будет "
 "закрыто."
 
-#: ayatanawebmail/application.py:1133
-#, python-brace-format
-msgid "You can run \"{command}\" to delete all your login settings."
-msgstr ""
-"Вы можете выполнить команду \"{command}\" для удаления всех ваших настроек "
-"входа."
-
-#: ayatanawebmail/application.py:1158
-#, python-format
-msgid "You have %d unread mail"
-msgid_plural "You have %d unread mails"
+#: /ayatanawebmail/application.py:1131
+#, fuzzy, python-format
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
 msgstr[0] "У вас %d непрочитанное письмо"
 msgstr[1] "У вас %d непрочитанных письма"
 msgstr[2] "У вас %d непрочитанных писем"
 
-#: ayatanawebmail/application.py:1185
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr "от %(t0)s, %(t1)s и других"
 
-#: ayatanawebmail/application.py:1187
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr "от %(t0)s и %(t1)s"
 
-#: ayatanawebmail/application.py:1189
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr "от %s"
 
-#: ayatanawebmail/application.py:1202
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr "Новое письмо от %s"
 
-#: ayatanawebmail/dialog.py:60
-msgid "Web page"
-msgstr "Веб-страница"
-
-#: ayatanawebmail/dialog.py:61
-msgid "Command"
-msgstr "Команда"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
+msgstr ""
 
-#: ayatanawebmail/dialog.py:93
+#: /ayatanawebmail/dialog.py:61
 msgid ""
-"Append an additional string - you can use the $MSG_THREAD and $MSG_UID "
-"placeholders."
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
-"Добавить дополнительную строку - Вы можете использовать $MSG_THREAD и "
-"$MSG_UID."
 
-#: ayatanawebmail/dialog.py:114 ayatanawebmail/dialog.py:128
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr "(Пусто)"
 
-#: ayatanawebmail/dialog.py:156
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr "Настройки Ayatana Webmail"
 
-#: ayatanawebmail/dialog.py:164
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr "Учётные записи"
 
-#: ayatanawebmail/dialog.py:165
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr "Опции"
 
-#: ayatanawebmail/dialog.py:166
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr "Поддержка"
 
-#: ayatanawebmail/dialog.py:167
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr "О"
 
-#: ayatanawebmail/dialog.py:228
-msgid ""
-"Please visit the following link and enable access for less secure apps:"
-msgstr ""
-"Пожалуйста, посетите следующую ссылку и включите доступ для менее безопасных "
-"приложений:"
-
-#: ayatanawebmail/dialog.py:230
-msgid "Access blocked by Google"
-msgstr "Доступ заблокирован Google"
-
-#: ayatanawebmail/dialog.py:234
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr "Не удалось подключиться к почтовой учетной записи. Вернувшаяся ошибка:"
 
-#: ayatanawebmail/dialog.py:235
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr "Ошибка соединения"
 
-#: ayatanawebmail/dialog.py:254
-msgid "Choose an account"
-msgstr "Выберите учётную запись"
-
-#: ayatanawebmail/dialog.py:259
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr "Добавить"
 
-#: ayatanawebmail/dialog.py:261
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr "Удалить"
 
-#: ayatanawebmail/dialog.py:276
-msgid "Server data"
-msgstr "Данные сервера"
+#: /ayatanawebmail/dialog.py:276
+#, fuzzy
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+msgstr ""
+"Добавить дополнительную строку - Вы можете использовать $MSG_THREAD и "
+"$MSG_UID."
 
-#: ayatanawebmail/dialog.py:278
-msgid "Account data"
-msgstr "Данные учетной записи"
+#: /ayatanawebmail/dialog.py:278
+#, fuzzy
+msgid "Account:"
+msgstr "Учётные записи"
 
-#: ayatanawebmail/dialog.py:289
-msgid "Links"
-msgstr "Ссылки"
+#: /ayatanawebmail/dialog.py:280
+#, fuzzy
+msgid "Server:"
+msgstr "Данные сервера"
 
-#: ayatanawebmail/dialog.py:297
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr "Узел:"
 
-#: ayatanawebmail/dialog.py:299
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr "Порт:"
 
-#: ayatanawebmail/dialog.py:302
-msgid "Login:"
-msgstr "Имя пользователя:"
+#: /ayatanawebmail/dialog.py:286
+msgid "Username:"
+msgstr ""
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr "Пароль:"
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr "Папки:"
 
-#: ayatanawebmail/dialog.py:309
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr "Домашняя:"
 
-#: ayatanawebmail/dialog.py:311
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr "Написать:"
 
-#: ayatanawebmail/dialog.py:313
+#: /ayatanawebmail/dialog.py:296
+msgid "Sent:"
+msgstr "Отправленные:"
+
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr "Входящие:"
 
-#: ayatanawebmail/dialog.py:316
-msgid "Sent:"
-msgstr "Отправленные:"
+#: /ayatanawebmail/dialog.py:300
+#, fuzzy
+msgid "Message:"
+msgstr "Взаимодействие с письмом"
 
-#: ayatanawebmail/dialog.py:354
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr "Пометить сообщение как прочитанное"
 
-#: ayatanawebmail/dialog.py:355
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr "Открыть сообщение в браузере/Выполнить команду"
 
-#: ayatanawebmail/dialog.py:356
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr "Спроси меня, что делать"
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr "Включить уведомления:"
 
-#: ayatanawebmail/dialog.py:368
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr "Воспроизвести звук, когда получено сообщение:"
 
-#: ayatanawebmail/dialog.py:370
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr "Объединить сообщения из одной беседы:"
 
-#: ayatanawebmail/dialog.py:372
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr "Спрятать количество, если ноль:"
 
-#: ayatanawebmail/dialog.py:374
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr "Когда сообщение активировано:"
 
-#: ayatanawebmail/dialog.py:377
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr "Выполнить эту команду, когда сообщение получено:"
 
-#: ayatanawebmail/dialog.py:384
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr "Проигрывать этот звук:"
 
-#: ayatanawebmail/dialog.py:400
-msgid "Report a bug/Request a feature"
+#: /ayatanawebmail/dialog.py:382
+msgid "Report a bug"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:384
+#, fuzzy
+msgid "Request a feature"
 msgstr "Сообщить об ошибке/Запросить новую функцию"
 
-#: ayatanawebmail/dialog.py:402
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
+#, python-brace-format
+msgid "It's a good idea to add the {labelname} label to your issue."
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:387
 msgid "Ask a question"
 msgstr "Задать вопрос"
 
-#: ayatanawebmail/dialog.py:404
+#: /ayatanawebmail/dialog.py:390
 msgid "Help translate"
 msgstr "Помочь с переводом"
 
-#: ayatanawebmail/dialog.py:406
-msgid "Project page"
-msgstr "Страница проекта"
-
-#: ayatanawebmail/dialog.py:408
+#: /ayatanawebmail/dialog.py:392
 msgid "Source code"
 msgstr "Исходный код"
 
-#: ayatanawebmail/dialog.py:410
-msgid "Repository"
-msgstr "Репозиторий"
-
-#: ayatanawebmail/dialog.py:412
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr "Домашняя страница"
 
-#: ayatanawebmail/dialog.py:426
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr "Переводчики"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
-msgstr "Ayatana Webmail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+#, fuzzy
+msgid "Enable notifications"
+msgstr "Включить уведомления:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+#, fuzzy
+msgid "Play sound when new messages arrive."
+msgstr "Воспроизвести звук, когда получено сообщение:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+#, fuzzy
+msgid "Hide message count"
+msgstr "Открыть сообщение/Выполнить команду"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+#, fuzzy
+msgid "Run this command when new messages arrive."
+msgstr "Выполнить эту команду, когда сообщение получено:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+#, fuzzy
+msgid "Custom sound"
+msgstr "Проигрывать этот звук:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+#, fuzzy
+msgid "Play a custom sound when new messages arrive."
+msgstr "Воспроизвести звук, когда получено сообщение:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+#, fuzzy
+msgid "Merge messages"
+msgstr "Пометить сообщение как прочитанное"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+#, fuzzy
+msgid "Merge messages belonging to the same conversation."
+msgstr "Объединить сообщения из одной беседы:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+#, fuzzy
+msgid "Message action"
+msgstr "Взаимодействие с письмом"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+#, fuzzy
+msgid "Action to perform when a message is activated."
+msgstr "Когда сообщение активировано:"
+
+#, python-brace-format
+#~ msgid "You can run \"{command}\" to delete all your login settings."
+#~ msgstr ""
+#~ "Вы можете выполнить команду \"{command}\" для удаления всех ваших "
+#~ "настроек входа."
+
+#~ msgid "Web page"
+#~ msgstr "Веб-страница"
+
+#~ msgid "Command"
+#~ msgstr "Команда"
+
+#~ msgid ""
+#~ "Please visit the following link and enable access for less secure apps:"
+#~ msgstr ""
+#~ "Пожалуйста, посетите следующую ссылку и включите доступ для менее "
+#~ "безопасных приложений:"
+
+#~ msgid "Access blocked by Google"
+#~ msgstr "Доступ заблокирован Google"
+
+#~ msgid "Choose an account"
+#~ msgstr "Выберите учётную запись"
+
+#~ msgid "Account data"
+#~ msgstr "Данные учетной записи"
+
+#~ msgid "Links"
+#~ msgstr "Ссылки"
+
+#~ msgid "Login:"
+#~ msgstr "Имя пользователя:"
+
+#~ msgid "Project page"
+#~ msgstr "Страница проекта"
+
+#~ msgid "Repository"
+#~ msgstr "Репозиторий"
+
+#~ msgid "Ayatana Webmail"
+#~ msgstr "Ayatana Webmail"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:39
-msgid "Webmail notifications and actions for any desktop"
-msgstr "Оповещения веб-почты и действия для любого компьютера"
+#~ msgid "Webmail notifications and actions for any desktop"
+#~ msgstr "Оповещения веб-почты и действия для любого компьютера"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:74
-msgid "Mark all as read"
-msgstr "Пометить все как прочитанное"
+#~ msgid "Mark all as read"
+#~ msgstr "Пометить все как прочитанное"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:112
-msgid "Compose Mail"
-msgstr "Написать письмо"
+#~ msgid "Compose Mail"
+#~ msgstr "Написать письмо"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:152
-msgid "Sent"
-msgstr "Отправленные"
+#~ msgid "Sent"
+#~ msgstr "Отправленные"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:228
-msgid "Inbox"
-msgstr "Входящие"
+#~ msgid "Inbox"
+#~ msgstr "Входящие"
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
-msgstr "Ayatana Webmail (служба)"
+#~ msgid "Ayatana Webmail (service)"
+#~ msgstr "Ayatana Webmail (служба)"
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:38
-msgid "Display notifications about new mail"
-msgstr "Отображать уведомления о новой почте"
+#~ msgid "Display notifications about new mail"
+#~ msgstr "Отображать уведомления о новой почте"
diff --git a/po/sa.po b/po/sa.po
index ddf2f2d..50e5bec 100644
--- a/po/sa.po
+++ b/po/sa.po
@@ -6,9 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail 22.6.28\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/"
-"issues\n"
-"POT-Creation-Date: 2020-08-22 20:15+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -18,301 +17,330 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n==1 ? 0 : n==2 ? 1 : 2;\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr ""
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr ""
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr ""
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:204
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr ""
 
-#: ayatanawebmail/application.py:211
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr ""
 
-#: ayatanawebmail/application.py:218
-#: data/usr/share/applications/ayatana-webmail.desktop:35
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr ""
 
-#: ayatanawebmail/application.py:957
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:1110
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr ""
 
-#: ayatanawebmail/application.py:1111
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
-msgid "Unable to connect to account \"{accountName}\", the application will now exit."
+msgid ""
+"Unable to connect to account \"{accountName}\", the application will now "
+"exit."
 msgstr ""
 
-#: ayatanawebmail/application.py:1136
+#: /ayatanawebmail/application.py:1131
 #, python-format
-msgid "You have %d unread mail"
-msgid_plural "You have %d unread mails"
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: ayatanawebmail/application.py:1163
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr ""
 
-#: ayatanawebmail/application.py:1165
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1167
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1180
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:60
-msgid "If this string starts with http:// or https://, the application will open it in your browser - otherwise, it will be run as a command"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:61
+msgid ""
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:90 ayatanawebmail/dialog.py:104
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:132
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:140
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:141
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:142
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:143
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:204
-msgid "Please visit the following link and enable access for less secure apps:"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:206
-msgid "Access blocked by Google"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:210
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:211
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:234
-msgid "Custom"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:242
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:244
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:286
-msgid "The application will append this string to \"Inbox\" to access a specific message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+#: /ayatanawebmail/dialog.py:276
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:288
+#: /ayatanawebmail/dialog.py:278
 msgid "Account:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:290
+#: /ayatanawebmail/dialog.py:280
 msgid "Server:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:292
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:294
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:296
+#: /ayatanawebmail/dialog.py:286
 msgid "Username:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:298
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:300
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:302
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:296
 msgid "Sent:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:308
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:310
+#: /ayatanawebmail/dialog.py:300
 msgid "Message:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:346
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:347
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:348
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:358
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:360
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:362
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:364
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:369
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:376
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:392
+#: /ayatanawebmail/dialog.py:382
 msgid "Report a bug"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:394
+#: /ayatanawebmail/dialog.py:384
 msgid "Request a feature"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:396 ayatanawebmail/dialog.py:399
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
 #, python-brace-format
 msgid "It's a good idea to add the {labelname} label to your issue."
 msgstr ""
 
-#: ayatanawebmail/dialog.py:397
+#: /ayatanawebmail/dialog.py:387
 msgid "Ask a question"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:400
+#: /ayatanawebmail/dialog.py:390
 msgid "Help translate"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:402
+#: /ayatanawebmail/dialog.py:392
 msgid "Source code"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:404
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:424
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+msgid "Enable notifications"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+msgid "Play sound when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+msgid "Hide message count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:5
-msgid "Display notifications about new mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+msgid "Run this command when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+msgid "Custom sound"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:5
-msgid "Webmail notifications and actions for any desktop"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+msgid "Play a custom sound when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:15
-msgid "Mark all as read"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+msgid "Merge messages"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:20
-msgid "Compose Mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+msgid "Merge messages belonging to the same conversation."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:25
-msgid "Sent"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+msgid "Message action"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:30
-msgid "Inbox"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+msgid "Action to perform when a message is activated."
 msgstr ""
diff --git a/po/sc.po b/po/sc.po
index 12b02ac..287dc95 100644
--- a/po/sc.po
+++ b/po/sc.po
@@ -6,13 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail 22.6.28\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/"
-"issues\n"
-"POT-Creation-Date: 2020-08-22 20:15+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: 2020-10-27 14:36+0000\n"
 "Last-Translator: Adrià Martín <adriamartinmor@gmail.com>\n"
-"Language-Team: Sardinian <https://hosted.weblate.org/projects/"
-"ayatana-indicators/ayatana-webmail/sc/>\n"
+"Language-Team: Sardinian <https://hosted.weblate.org/projects/ayatana-"
+"indicators/ayatana-webmail/sc/>\n"
 "Language: sc\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,304 +19,373 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 4.3.2-dev\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr "Seletziona unu contu"
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr "Cale cumandu o situ web de su contu boles abèrrere?"
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr "Atziones de su messàgiu"
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr "Cantzella"
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr "Marca comente lèghidu"
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr ""
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr ""
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr "Ogetu"
 
-#: ayatanawebmail/application.py:204
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr "Aberi sa pàgina printzipale de sa posta"
 
-#: ayatanawebmail/application.py:211
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr "Lìmpia"
 
-#: ayatanawebmail/application.py:218
-#: data/usr/share/applications/ayatana-webmail.desktop:35
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr "Cunfiguratzione"
 
-#: ayatanawebmail/application.py:957
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr "Perunu ogetu"
 
-#: ayatanawebmail/application.py:1110
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr "Faddina de connessione"
 
-#: ayatanawebmail/application.py:1111
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
-msgid "Unable to connect to account \"{accountName}\", the application will now exit."
+msgid ""
+"Unable to connect to account \"{accountName}\", the application will now "
+"exit."
 msgstr ""
 "Impossìbile connètere a su contu \"{accountName}\"; s'aplicatzione at a "
 "èssere serrada immoe."
 
-#: ayatanawebmail/application.py:1136
-#, python-format
-msgid "You have %d unread mail"
-msgid_plural "You have %d unread mails"
+#: /ayatanawebmail/application.py:1131
+#, fuzzy, python-format
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
 msgstr[0] "Tenes %d messàgiu de lèghere"
 msgstr[1] "Tenes %d messàgios de lèghere"
 
-#: ayatanawebmail/application.py:1163
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr "dae %(t0)s,%(t1)s e àteru"
 
-#: ayatanawebmail/application.py:1165
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr "dae %(t0)s e %(t1)s"
 
-#: ayatanawebmail/application.py:1167
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr "dae %s"
 
-#: ayatanawebmail/application.py:1180
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr "Messàgiu nou dae %s"
 
-#: ayatanawebmail/dialog.py:60
-msgid "If this string starts with http:// or https://, the application will open it in your browser - otherwise, it will be run as a command"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
+msgstr "Personalizadu"
+
+#: /ayatanawebmail/dialog.py:61
+msgid ""
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:90 ayatanawebmail/dialog.py:104
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr "(Perunu)"
 
-#: ayatanawebmail/dialog.py:132
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr "Preferèntzias de Ayatana Webmail"
 
-#: ayatanawebmail/dialog.py:140
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr "Contos"
 
-#: ayatanawebmail/dialog.py:141
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr "Optziones"
 
-#: ayatanawebmail/dialog.py:142
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr "Agiudu"
 
-#: ayatanawebmail/dialog.py:143
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr "Informatziones"
 
-#: ayatanawebmail/dialog.py:204
-msgid "Please visit the following link and enable access for less secure apps:"
-msgstr ""
-"Bìsita su ligàmene imbeniente e ativa s'atzessu a is aplicatziones prus pagu "
-"seguras:"
-
-#: ayatanawebmail/dialog.py:206
-msgid "Access blocked by Google"
-msgstr "Google at blocadu s'atzessu"
-
-#: ayatanawebmail/dialog.py:210
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr "Faddina in sa connessione a su contu de posta:"
 
-#: ayatanawebmail/dialog.py:211
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr "Faddina de connessione"
 
-#: ayatanawebmail/dialog.py:234
-msgid "Custom"
-msgstr "Personalizadu"
-
-#: ayatanawebmail/dialog.py:242
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr "Agiunghe"
 
-#: ayatanawebmail/dialog.py:244
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr "Cantzella"
 
-#: ayatanawebmail/dialog.py:286
-msgid "The application will append this string to \"Inbox\" to access a specific message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+#: /ayatanawebmail/dialog.py:276
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:288
+#: /ayatanawebmail/dialog.py:278
 msgid "Account:"
 msgstr "Contu:"
 
-#: ayatanawebmail/dialog.py:290
+#: /ayatanawebmail/dialog.py:280
 msgid "Server:"
 msgstr "Server:"
 
-#: ayatanawebmail/dialog.py:292
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:294
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr "Portu:"
 
-#: ayatanawebmail/dialog.py:296
+#: /ayatanawebmail/dialog.py:286
 msgid "Username:"
 msgstr "Nòmine utente:"
 
-#: ayatanawebmail/dialog.py:298
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr "Crae:"
 
-#: ayatanawebmail/dialog.py:300
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr "Cartellas:"
 
-#: ayatanawebmail/dialog.py:302
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr "Printzipale:"
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:296
 msgid "Sent:"
 msgstr "Imbiados:"
 
-#: ayatanawebmail/dialog.py:308
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr "In intrada:"
 
-#: ayatanawebmail/dialog.py:310
+#: /ayatanawebmail/dialog.py:300
 msgid "Message:"
 msgstr "Messàgiu:"
 
-#: ayatanawebmail/dialog.py:346
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr "Marca comente lèghidu"
 
-#: ayatanawebmail/dialog.py:347
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:348
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr "Dimanda·mi sa cosa de fàghere"
 
-#: ayatanawebmail/dialog.py:358
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr "Ativa notìficas:"
 
-#: ayatanawebmail/dialog.py:360
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr "Reprodue unu sonu cando arribat unu messàgiu:"
 
-#: ayatanawebmail/dialog.py:362
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:364
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr "Cando unu messàgiu est seletzionadu:"
 
-#: ayatanawebmail/dialog.py:369
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:376
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr "Sonu personalizadu:"
 
-#: ayatanawebmail/dialog.py:392
+#: /ayatanawebmail/dialog.py:382
 msgid "Report a bug"
 msgstr "Signala una faddina"
 
-#: ayatanawebmail/dialog.py:394
+#: /ayatanawebmail/dialog.py:384
 msgid "Request a feature"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:396 ayatanawebmail/dialog.py:399
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
 #, python-brace-format
 msgid "It's a good idea to add the {labelname} label to your issue."
 msgstr ""
 
-#: ayatanawebmail/dialog.py:397
+#: /ayatanawebmail/dialog.py:387
 msgid "Ask a question"
 msgstr "Faghe una dimanda"
 
-#: ayatanawebmail/dialog.py:400
+#: /ayatanawebmail/dialog.py:390
 msgid "Help translate"
 msgstr "Agiuda a tradùere"
 
-#: ayatanawebmail/dialog.py:402
+#: /ayatanawebmail/dialog.py:392
 msgid "Source code"
 msgstr "Còdighe de orìgine"
 
-#: ayatanawebmail/dialog.py:404
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr "Pàgina printzipale"
 
-#: ayatanawebmail/dialog.py:424
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr "Sardware"
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
-msgstr "Ayatana Webmail (servìtziu)"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+#, fuzzy
+msgid "Enable notifications"
+msgstr "Ativa notìficas:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+#, fuzzy
+msgid "Play sound when new messages arrive."
+msgstr "Reprodue unu sonu cando arribat unu messàgiu:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+#, fuzzy
+msgid "Hide message count"
+msgstr "Atziones de su messàgiu"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+#, fuzzy
+msgid "Run this command when new messages arrive."
+msgstr "Reprodue unu sonu cando arribat unu messàgiu:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+#, fuzzy
+msgid "Custom sound"
+msgstr "Sonu personalizadu:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+#, fuzzy
+msgid "Play a custom sound when new messages arrive."
+msgstr "Reprodue unu sonu cando arribat unu messàgiu:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+#, fuzzy
+msgid "Merge messages"
+msgstr "Marca comente lèghidu"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+msgid "Merge messages belonging to the same conversation."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+#, fuzzy
+msgid "Message action"
+msgstr "Atziones de su messàgiu"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+#, fuzzy
+msgid "Action to perform when a message is activated."
+msgstr "Cando unu messàgiu est seletzionadu:"
+
+#~ msgid ""
+#~ "Please visit the following link and enable access for less secure apps:"
+#~ msgstr ""
+#~ "Bìsita su ligàmene imbeniente e ativa s'atzessu a is aplicatziones prus "
+#~ "pagu seguras:"
+
+#~ msgid "Access blocked by Google"
+#~ msgstr "Google at blocadu s'atzessu"
+
+#~ msgid "Ayatana Webmail (service)"
+#~ msgstr "Ayatana Webmail (servìtziu)"
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:5
-msgid "Display notifications about new mail"
-msgstr "Ammustra notìficas cando ddoe est posta noa"
+#~ msgid "Display notifications about new mail"
+#~ msgstr "Ammustra notìficas cando ddoe est posta noa"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
-msgstr "Ayatana Webmail"
+#~ msgid "Ayatana Webmail"
+#~ msgstr "Ayatana Webmail"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:5
-msgid "Webmail notifications and actions for any desktop"
-msgstr "Notìficas e atziones de posta eletrònica pro cale si siat sistema"
+#~ msgid "Webmail notifications and actions for any desktop"
+#~ msgstr "Notìficas e atziones de posta eletrònica pro cale si siat sistema"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:15
-msgid "Mark all as read"
-msgstr "Marca totu comente lèghidu"
+#~ msgid "Mark all as read"
+#~ msgstr "Marca totu comente lèghidu"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:20
-msgid "Compose Mail"
-msgstr "Iscrìe unu messàgiu"
+#~ msgid "Compose Mail"
+#~ msgstr "Iscrìe unu messàgiu"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:25
-msgid "Sent"
-msgstr "Imbiadu"
+#~ msgid "Sent"
+#~ msgstr "Imbiadu"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:30
-msgid "Inbox"
-msgstr "In intrada"
+#~ msgid "Inbox"
+#~ msgstr "In intrada"
diff --git a/po/sd.po b/po/sd.po
index da0b996..907cd53 100644
--- a/po/sd.po
+++ b/po/sd.po
@@ -6,9 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail 22.6.28\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/"
-"issues\n"
-"POT-Creation-Date: 2020-08-22 20:15+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -18,300 +17,329 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr ""
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr ""
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr ""
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:204
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr ""
 
-#: ayatanawebmail/application.py:211
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr ""
 
-#: ayatanawebmail/application.py:218
-#: data/usr/share/applications/ayatana-webmail.desktop:35
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr ""
 
-#: ayatanawebmail/application.py:957
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:1110
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr ""
 
-#: ayatanawebmail/application.py:1111
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
-msgid "Unable to connect to account \"{accountName}\", the application will now exit."
+msgid ""
+"Unable to connect to account \"{accountName}\", the application will now "
+"exit."
 msgstr ""
 
-#: ayatanawebmail/application.py:1136
+#: /ayatanawebmail/application.py:1131
 #, python-format
-msgid "You have %d unread mail"
-msgid_plural "You have %d unread mails"
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ayatanawebmail/application.py:1163
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr ""
 
-#: ayatanawebmail/application.py:1165
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1167
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1180
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:60
-msgid "If this string starts with http:// or https://, the application will open it in your browser - otherwise, it will be run as a command"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:61
+msgid ""
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:90 ayatanawebmail/dialog.py:104
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:132
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:140
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:141
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:142
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:143
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:204
-msgid "Please visit the following link and enable access for less secure apps:"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:206
-msgid "Access blocked by Google"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:210
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:211
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:234
-msgid "Custom"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:242
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:244
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:286
-msgid "The application will append this string to \"Inbox\" to access a specific message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+#: /ayatanawebmail/dialog.py:276
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:288
+#: /ayatanawebmail/dialog.py:278
 msgid "Account:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:290
+#: /ayatanawebmail/dialog.py:280
 msgid "Server:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:292
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:294
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:296
+#: /ayatanawebmail/dialog.py:286
 msgid "Username:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:298
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:300
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:302
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:296
 msgid "Sent:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:308
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:310
+#: /ayatanawebmail/dialog.py:300
 msgid "Message:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:346
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:347
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:348
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:358
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:360
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:362
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:364
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:369
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:376
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:392
+#: /ayatanawebmail/dialog.py:382
 msgid "Report a bug"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:394
+#: /ayatanawebmail/dialog.py:384
 msgid "Request a feature"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:396 ayatanawebmail/dialog.py:399
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
 #, python-brace-format
 msgid "It's a good idea to add the {labelname} label to your issue."
 msgstr ""
 
-#: ayatanawebmail/dialog.py:397
+#: /ayatanawebmail/dialog.py:387
 msgid "Ask a question"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:400
+#: /ayatanawebmail/dialog.py:390
 msgid "Help translate"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:402
+#: /ayatanawebmail/dialog.py:392
 msgid "Source code"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:404
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:424
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+msgid "Enable notifications"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+msgid "Play sound when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+msgid "Hide message count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:5
-msgid "Display notifications about new mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+msgid "Run this command when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+msgid "Custom sound"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:5
-msgid "Webmail notifications and actions for any desktop"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+msgid "Play a custom sound when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:15
-msgid "Mark all as read"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+msgid "Merge messages"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:20
-msgid "Compose Mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+msgid "Merge messages belonging to the same conversation."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:25
-msgid "Sent"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+msgid "Message action"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:30
-msgid "Inbox"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+msgid "Action to perform when a message is activated."
 msgstr ""
diff --git a/po/sdh.po b/po/sdh.po
index b14f715..c6b953b 100644
--- a/po/sdh.po
+++ b/po/sdh.po
@@ -6,9 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail 22.6.28\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/"
-"issues\n"
-"POT-Creation-Date: 2021-01-03 14:41+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -18,300 +17,329 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr ""
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr ""
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr ""
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:204
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr ""
 
-#: ayatanawebmail/application.py:211
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr ""
 
-#: ayatanawebmail/application.py:218
-#: data/usr/share/applications/ayatana-webmail.desktop:35
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr ""
 
-#: ayatanawebmail/application.py:957
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:1110
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr ""
 
-#: ayatanawebmail/application.py:1111
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
-msgid "Unable to connect to account \"{accountName}\", the application will now exit."
+msgid ""
+"Unable to connect to account \"{accountName}\", the application will now "
+"exit."
 msgstr ""
 
-#: ayatanawebmail/application.py:1136
+#: /ayatanawebmail/application.py:1131
 #, python-format
 msgid "You have %d unread message"
 msgid_plural "You have %d unread messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ayatanawebmail/application.py:1163
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr ""
 
-#: ayatanawebmail/application.py:1165
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1167
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1180
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:60
-msgid "If this string starts with http:// or https://, the application will open it in your browser - otherwise, it will be run as a command"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:61
+msgid ""
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:90 ayatanawebmail/dialog.py:104
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:132
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:140
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:141
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:142
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:143
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:204
-msgid "Please visit the following link and enable access for less secure apps:"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:206
-msgid "Access blocked by Google"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:210
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:211
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:234
-msgid "Custom"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:242
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:244
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:286
-msgid "The application will append this string to \"Inbox\" to access a specific message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+#: /ayatanawebmail/dialog.py:276
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:288
+#: /ayatanawebmail/dialog.py:278
 msgid "Account:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:290
+#: /ayatanawebmail/dialog.py:280
 msgid "Server:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:292
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:294
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:296
+#: /ayatanawebmail/dialog.py:286
 msgid "Username:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:298
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:300
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:302
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:296
 msgid "Sent:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:308
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:310
+#: /ayatanawebmail/dialog.py:300
 msgid "Message:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:346
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:347
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:348
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:358
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:360
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:362
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:364
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:369
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:376
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:392
+#: /ayatanawebmail/dialog.py:382
 msgid "Report a bug"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:394
+#: /ayatanawebmail/dialog.py:384
 msgid "Request a feature"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:396 ayatanawebmail/dialog.py:399
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
 #, python-brace-format
 msgid "It's a good idea to add the {labelname} label to your issue."
 msgstr ""
 
-#: ayatanawebmail/dialog.py:397
+#: /ayatanawebmail/dialog.py:387
 msgid "Ask a question"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:400
+#: /ayatanawebmail/dialog.py:390
 msgid "Help translate"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:402
+#: /ayatanawebmail/dialog.py:392
 msgid "Source code"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:404
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:424
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+msgid "Enable notifications"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+msgid "Play sound when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+msgid "Hide message count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:5
-msgid "Display notifications about new mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+msgid "Run this command when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+msgid "Custom sound"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:5
-msgid "Webmail notifications and actions for any desktop"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+msgid "Play a custom sound when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:15
-msgid "Mark all as read"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+msgid "Merge messages"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:20
-msgid "Compose Mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+msgid "Merge messages belonging to the same conversation."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:25
-msgid "Sent"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+msgid "Message action"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:30
-msgid "Inbox"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+msgid "Action to perform when a message is activated."
 msgstr ""
diff --git a/po/se.po b/po/se.po
index 6e07bb8..d3cc1cb 100644
--- a/po/se.po
+++ b/po/se.po
@@ -6,9 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail 22.6.28\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/"
-"issues\n"
-"POT-Creation-Date: 2020-08-22 20:15+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -18,301 +17,330 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n == 1) ? 0 : ((n == 2) ? 1 : 2);\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr ""
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr ""
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr ""
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:204
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr ""
 
-#: ayatanawebmail/application.py:211
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr ""
 
-#: ayatanawebmail/application.py:218
-#: data/usr/share/applications/ayatana-webmail.desktop:35
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr ""
 
-#: ayatanawebmail/application.py:957
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:1110
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr ""
 
-#: ayatanawebmail/application.py:1111
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
-msgid "Unable to connect to account \"{accountName}\", the application will now exit."
+msgid ""
+"Unable to connect to account \"{accountName}\", the application will now "
+"exit."
 msgstr ""
 
-#: ayatanawebmail/application.py:1136
+#: /ayatanawebmail/application.py:1131
 #, python-format
-msgid "You have %d unread mail"
-msgid_plural "You have %d unread mails"
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: ayatanawebmail/application.py:1163
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr ""
 
-#: ayatanawebmail/application.py:1165
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1167
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1180
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:60
-msgid "If this string starts with http:// or https://, the application will open it in your browser - otherwise, it will be run as a command"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:61
+msgid ""
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:90 ayatanawebmail/dialog.py:104
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:132
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:140
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:141
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:142
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:143
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:204
-msgid "Please visit the following link and enable access for less secure apps:"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:206
-msgid "Access blocked by Google"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:210
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:211
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:234
-msgid "Custom"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:242
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:244
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:286
-msgid "The application will append this string to \"Inbox\" to access a specific message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+#: /ayatanawebmail/dialog.py:276
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:288
+#: /ayatanawebmail/dialog.py:278
 msgid "Account:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:290
+#: /ayatanawebmail/dialog.py:280
 msgid "Server:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:292
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:294
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:296
+#: /ayatanawebmail/dialog.py:286
 msgid "Username:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:298
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:300
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:302
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:296
 msgid "Sent:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:308
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:310
+#: /ayatanawebmail/dialog.py:300
 msgid "Message:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:346
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:347
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:348
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:358
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:360
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:362
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:364
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:369
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:376
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:392
+#: /ayatanawebmail/dialog.py:382
 msgid "Report a bug"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:394
+#: /ayatanawebmail/dialog.py:384
 msgid "Request a feature"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:396 ayatanawebmail/dialog.py:399
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
 #, python-brace-format
 msgid "It's a good idea to add the {labelname} label to your issue."
 msgstr ""
 
-#: ayatanawebmail/dialog.py:397
+#: /ayatanawebmail/dialog.py:387
 msgid "Ask a question"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:400
+#: /ayatanawebmail/dialog.py:390
 msgid "Help translate"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:402
+#: /ayatanawebmail/dialog.py:392
 msgid "Source code"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:404
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:424
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+msgid "Enable notifications"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+msgid "Play sound when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+msgid "Hide message count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:5
-msgid "Display notifications about new mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+msgid "Run this command when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+msgid "Custom sound"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:5
-msgid "Webmail notifications and actions for any desktop"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+msgid "Play a custom sound when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:15
-msgid "Mark all as read"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+msgid "Merge messages"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:20
-msgid "Compose Mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+msgid "Merge messages belonging to the same conversation."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:25
-msgid "Sent"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+msgid "Message action"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:30
-msgid "Inbox"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+msgid "Action to perform when a message is activated."
 msgstr ""
diff --git a/po/shn.po b/po/shn.po
index 7864586..5baa692 100644
--- a/po/shn.po
+++ b/po/shn.po
@@ -6,9 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail 22.6.28\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/"
-"issues\n"
-"POT-Creation-Date: 2020-08-22 20:15+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -18,300 +17,329 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr ""
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr ""
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr ""
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:204
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr ""
 
-#: ayatanawebmail/application.py:211
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr ""
 
-#: ayatanawebmail/application.py:218
-#: data/usr/share/applications/ayatana-webmail.desktop:35
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr ""
 
-#: ayatanawebmail/application.py:957
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:1110
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr ""
 
-#: ayatanawebmail/application.py:1111
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
-msgid "Unable to connect to account \"{accountName}\", the application will now exit."
+msgid ""
+"Unable to connect to account \"{accountName}\", the application will now "
+"exit."
 msgstr ""
 
-#: ayatanawebmail/application.py:1136
+#: /ayatanawebmail/application.py:1131
 #, python-format
-msgid "You have %d unread mail"
-msgid_plural "You have %d unread mails"
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ayatanawebmail/application.py:1163
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr ""
 
-#: ayatanawebmail/application.py:1165
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1167
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1180
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:60
-msgid "If this string starts with http:// or https://, the application will open it in your browser - otherwise, it will be run as a command"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:61
+msgid ""
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:90 ayatanawebmail/dialog.py:104
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:132
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:140
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:141
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:142
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:143
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:204
-msgid "Please visit the following link and enable access for less secure apps:"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:206
-msgid "Access blocked by Google"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:210
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:211
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:234
-msgid "Custom"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:242
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:244
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:286
-msgid "The application will append this string to \"Inbox\" to access a specific message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+#: /ayatanawebmail/dialog.py:276
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:288
+#: /ayatanawebmail/dialog.py:278
 msgid "Account:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:290
+#: /ayatanawebmail/dialog.py:280
 msgid "Server:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:292
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:294
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:296
+#: /ayatanawebmail/dialog.py:286
 msgid "Username:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:298
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:300
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:302
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:296
 msgid "Sent:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:308
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:310
+#: /ayatanawebmail/dialog.py:300
 msgid "Message:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:346
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:347
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:348
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:358
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:360
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:362
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:364
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:369
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:376
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:392
+#: /ayatanawebmail/dialog.py:382
 msgid "Report a bug"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:394
+#: /ayatanawebmail/dialog.py:384
 msgid "Request a feature"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:396 ayatanawebmail/dialog.py:399
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
 #, python-brace-format
 msgid "It's a good idea to add the {labelname} label to your issue."
 msgstr ""
 
-#: ayatanawebmail/dialog.py:397
+#: /ayatanawebmail/dialog.py:387
 msgid "Ask a question"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:400
+#: /ayatanawebmail/dialog.py:390
 msgid "Help translate"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:402
+#: /ayatanawebmail/dialog.py:392
 msgid "Source code"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:404
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:424
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+msgid "Enable notifications"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+msgid "Play sound when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+msgid "Hide message count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:5
-msgid "Display notifications about new mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+msgid "Run this command when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+msgid "Custom sound"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:5
-msgid "Webmail notifications and actions for any desktop"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+msgid "Play a custom sound when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:15
-msgid "Mark all as read"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+msgid "Merge messages"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:20
-msgid "Compose Mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+msgid "Merge messages belonging to the same conversation."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:25
-msgid "Sent"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+msgid "Message action"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:30
-msgid "Inbox"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+msgid "Action to perform when a message is activated."
 msgstr ""
diff --git a/po/si.po b/po/si.po
index 8771b9a..08fbf1d 100644
--- a/po/si.po
+++ b/po/si.po
@@ -6,9 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail 22.6.28\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/"
-"issues\n"
-"POT-Creation-Date: 2020-08-22 20:15+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -18,300 +17,329 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr ""
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr ""
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr ""
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:204
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr ""
 
-#: ayatanawebmail/application.py:211
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr ""
 
-#: ayatanawebmail/application.py:218
-#: data/usr/share/applications/ayatana-webmail.desktop:35
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr ""
 
-#: ayatanawebmail/application.py:957
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:1110
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr ""
 
-#: ayatanawebmail/application.py:1111
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
-msgid "Unable to connect to account \"{accountName}\", the application will now exit."
+msgid ""
+"Unable to connect to account \"{accountName}\", the application will now "
+"exit."
 msgstr ""
 
-#: ayatanawebmail/application.py:1136
+#: /ayatanawebmail/application.py:1131
 #, python-format
-msgid "You have %d unread mail"
-msgid_plural "You have %d unread mails"
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ayatanawebmail/application.py:1163
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr ""
 
-#: ayatanawebmail/application.py:1165
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1167
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1180
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:60
-msgid "If this string starts with http:// or https://, the application will open it in your browser - otherwise, it will be run as a command"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:61
+msgid ""
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:90 ayatanawebmail/dialog.py:104
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:132
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:140
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:141
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:142
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:143
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:204
-msgid "Please visit the following link and enable access for less secure apps:"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:206
-msgid "Access blocked by Google"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:210
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:211
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:234
-msgid "Custom"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:242
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:244
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:286
-msgid "The application will append this string to \"Inbox\" to access a specific message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+#: /ayatanawebmail/dialog.py:276
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:288
+#: /ayatanawebmail/dialog.py:278
 msgid "Account:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:290
+#: /ayatanawebmail/dialog.py:280
 msgid "Server:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:292
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:294
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:296
+#: /ayatanawebmail/dialog.py:286
 msgid "Username:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:298
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:300
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:302
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:296
 msgid "Sent:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:308
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:310
+#: /ayatanawebmail/dialog.py:300
 msgid "Message:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:346
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:347
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:348
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:358
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:360
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:362
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:364
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:369
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:376
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:392
+#: /ayatanawebmail/dialog.py:382
 msgid "Report a bug"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:394
+#: /ayatanawebmail/dialog.py:384
 msgid "Request a feature"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:396 ayatanawebmail/dialog.py:399
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
 #, python-brace-format
 msgid "It's a good idea to add the {labelname} label to your issue."
 msgstr ""
 
-#: ayatanawebmail/dialog.py:397
+#: /ayatanawebmail/dialog.py:387
 msgid "Ask a question"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:400
+#: /ayatanawebmail/dialog.py:390
 msgid "Help translate"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:402
+#: /ayatanawebmail/dialog.py:392
 msgid "Source code"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:404
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:424
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+msgid "Enable notifications"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+msgid "Play sound when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+msgid "Hide message count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:5
-msgid "Display notifications about new mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+msgid "Run this command when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+msgid "Custom sound"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:5
-msgid "Webmail notifications and actions for any desktop"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+msgid "Play a custom sound when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:15
-msgid "Mark all as read"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+msgid "Merge messages"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:20
-msgid "Compose Mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+msgid "Merge messages belonging to the same conversation."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:25
-msgid "Sent"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+msgid "Message action"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:30
-msgid "Inbox"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+msgid "Action to perform when a message is activated."
 msgstr ""
diff --git a/po/sk.po b/po/sk.po
index 4dcbab1..a955005 100755
--- a/po/sk.po
+++ b/po/sk.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/issues\n"
-"POT-Creation-Date: 2020-04-03 12:21+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: 2018-06-04 07:33+0000\n"
 "Language-Team: Slovak <sk@li.org>\n"
+"Language: sk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -17,313 +18,360 @@ msgstr ""
 "X-Launchpad-Export-Date: 2020-04-04 05:58+0000\n"
 "X-Generator: Launchpad (build a296f04231dee355be5db73cc878b9e21689a253)\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr ""
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr ""
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr ""
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:205
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr ""
 
-#: ayatanawebmail/application.py:212
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr ""
 
-#: ayatanawebmail/application.py:219
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr ""
 
-#: ayatanawebmail/application.py:980
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr "Bez predmetu"
 
-#: ayatanawebmail/application.py:1132
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr ""
 
-#: ayatanawebmail/application.py:1133
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
 msgid ""
 "Unable to connect to account \"{accountName}\", the application will now "
 "exit."
 msgstr ""
 
-#: ayatanawebmail/application.py:1133
-#, python-brace-format
-msgid "You can run \"{command}\" to delete all your login settings."
-msgstr ""
-
-#: ayatanawebmail/application.py:1158
-#, python-format
-msgid "You have %d unread mail"
-msgid_plural "You have %d unread mails"
+#: /ayatanawebmail/application.py:1131
+#, fuzzy, python-format
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
 msgstr[0] "Máte %d neprečítanú správu"
 msgstr[1] "Máte %d neprečítaných správ"
 msgstr[2] "Máte %d neprečítaných správ"
 
-#: ayatanawebmail/application.py:1185
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr ""
 
-#: ayatanawebmail/application.py:1187
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1189
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1202
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr "Nová správa od %s"
 
-#: ayatanawebmail/dialog.py:60
-msgid "Web page"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:61
-msgid "Command"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:93
+#: /ayatanawebmail/dialog.py:61
 msgid ""
-"Append an additional string - you can use the $MSG_THREAD and $MSG_UID "
-"placeholders."
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:114 ayatanawebmail/dialog.py:128
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:156
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr "Napísať správu"
 
-#: ayatanawebmail/dialog.py:164
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr "Účty"
 
-#: ayatanawebmail/dialog.py:165
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr "Predvoľby"
 
-#: ayatanawebmail/dialog.py:166
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:167
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:228
-msgid ""
-"Please visit the following link and enable access for less secure apps:"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:230
-msgid "Access blocked by Google"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:234
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:235
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:254
-msgid "Choose an account"
-msgstr "Zvoliť účet"
-
-#: ayatanawebmail/dialog.py:259
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:261
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:276
-msgid "Server data"
-msgstr "Nastavenie servera"
+#: /ayatanawebmail/dialog.py:276
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+msgstr ""
 
-#: ayatanawebmail/dialog.py:278
-msgid "Account data"
-msgstr "Údaje o účte"
+#: /ayatanawebmail/dialog.py:278
+#, fuzzy
+msgid "Account:"
+msgstr "Účty"
 
-#: ayatanawebmail/dialog.py:289
-msgid "Links"
-msgstr ""
+#: /ayatanawebmail/dialog.py:280
+#, fuzzy
+msgid "Server:"
+msgstr "Nastavenie servera"
 
-#: ayatanawebmail/dialog.py:297
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr "Názov servera:"
 
-#: ayatanawebmail/dialog.py:299
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr "Port:"
 
-#: ayatanawebmail/dialog.py:302
-msgid "Login:"
-msgstr "Prihlasovacie meno:"
+#: /ayatanawebmail/dialog.py:286
+msgid "Username:"
+msgstr ""
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr "Heslo:"
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:309
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr "Domov:"
 
-#: ayatanawebmail/dialog.py:311
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr "Napísať správu:"
 
-#: ayatanawebmail/dialog.py:313
+#: /ayatanawebmail/dialog.py:296
+msgid "Sent:"
+msgstr "Odoslané správy"
+
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr "Prijatá pošta"
 
-#: ayatanawebmail/dialog.py:316
-msgid "Sent:"
-msgstr "Odoslané správy"
+#: /ayatanawebmail/dialog.py:300
+msgid "Message:"
+msgstr ""
 
-#: ayatanawebmail/dialog.py:354
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:355
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:356
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr "Povoliť notifikácie:"
 
-#: ayatanawebmail/dialog.py:368
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:370
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:372
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:374
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:377
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:384
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:400
-msgid "Report a bug/Request a feature"
+#: /ayatanawebmail/dialog.py:382
+msgid "Report a bug"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:402
-msgid "Ask a question"
+#: /ayatanawebmail/dialog.py:384
+msgid "Request a feature"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:404
-msgid "Help translate"
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
+#, python-brace-format
+msgid "It's a good idea to add the {labelname} label to your issue."
 msgstr ""
 
-#: ayatanawebmail/dialog.py:406
-msgid "Project page"
+#: /ayatanawebmail/dialog.py:387
+msgid "Ask a question"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:408
-msgid "Source code"
+#: /ayatanawebmail/dialog.py:390
+msgid "Help translate"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:410
-msgid "Repository"
+#: /ayatanawebmail/dialog.py:392
+msgid "Source code"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:412
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:426
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
-msgstr "Ayatana Webmail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:39
-msgid "Webmail notifications and actions for any desktop"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:74
-msgid "Mark all as read"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+#, fuzzy
+msgid "Enable notifications"
+msgstr "Povoliť notifikácie:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:112
-msgid "Compose Mail"
-msgstr "Napísať správu"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:152
-msgid "Sent"
-msgstr "Odoslané správy"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+msgid "Play sound when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+msgid "Hide message count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+msgid "Run this command when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+msgid "Custom sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+msgid "Play a custom sound when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+msgid "Merge messages"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+msgid "Merge messages belonging to the same conversation."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+msgid "Message action"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+msgid "Action to perform when a message is activated."
+msgstr ""
+
+#~ msgid "Choose an account"
+#~ msgstr "Zvoliť účet"
+
+#~ msgid "Account data"
+#~ msgstr "Údaje o účte"
+
+#~ msgid "Login:"
+#~ msgstr "Prihlasovacie meno:"
+
+#~ msgid "Ayatana Webmail"
+#~ msgstr "Ayatana Webmail"
+
+#~ msgid "Compose Mail"
+#~ msgstr "Napísať správu"
+
+#~ msgid "Sent"
+#~ msgstr "Odoslané správy"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:228
-msgid "Inbox"
-msgstr "Doručená pošta"
+#~ msgid "Inbox"
+#~ msgstr "Doručená pošta"
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
-msgstr "Ayatana Webmail (služba)"
+#~ msgid "Ayatana Webmail (service)"
+#~ msgstr "Ayatana Webmail (služba)"
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:38
-msgid "Display notifications about new mail"
-msgstr "Zobraziť notifikácie o novej pošte"
+#~ msgid "Display notifications about new mail"
+#~ msgstr "Zobraziť notifikácie o novej pošte"
diff --git a/po/sl.po b/po/sl.po
index e9a2917..2fdfe42 100755
--- a/po/sl.po
+++ b/po/sl.po
@@ -6,326 +6,388 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/issues\n"
-"POT-Creation-Date: 2020-04-03 12:21+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: 2018-06-04 07:33+0000\n"
 "Language-Team: Slovenian <sl@li.org>\n"
+"Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || "
-"n%100==4 ? 3 : 0);\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
+"%100==4 ? 3 : 0);\n"
 "X-Launchpad-Export-Date: 2020-04-04 05:58+0000\n"
 "X-Generator: Launchpad (build a296f04231dee355be5db73cc878b9e21689a253)\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr ""
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr "Izbriši"
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr "Označi kot prebrano"
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr ""
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr "Pošiljatelj"
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr "Zadeva"
 
-#: ayatanawebmail/application.py:205
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr ""
 
-#: ayatanawebmail/application.py:212
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr "Počisti"
 
-#: ayatanawebmail/application.py:219
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr "Nastavitve"
 
-#: ayatanawebmail/application.py:980
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr "Brez zadeve"
 
-#: ayatanawebmail/application.py:1132
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr ""
 
-#: ayatanawebmail/application.py:1133
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
 msgid ""
 "Unable to connect to account \"{accountName}\", the application will now "
 "exit."
 msgstr ""
 
-#: ayatanawebmail/application.py:1133
-#, python-brace-format
-msgid "You can run \"{command}\" to delete all your login settings."
-msgstr ""
-
-#: ayatanawebmail/application.py:1158
-#, python-format
-msgid "You have %d unread mail"
-msgid_plural "You have %d unread mails"
+#: /ayatanawebmail/application.py:1131
+#, fuzzy, python-format
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
 msgstr[0] "Imate %d neprebranih sporočil"
 msgstr[1] "Imate %d neprebrano sporočilo"
 msgstr[2] "Imate %d neprebrani sporočili"
 msgstr[3] "Imate %d neprebrana sporočila"
 
-#: ayatanawebmail/application.py:1185
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr "od %(t0)s, %(t1)s in ostalih"
 
-#: ayatanawebmail/application.py:1187
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr "od %(t0)s in %(t1)s"
 
-#: ayatanawebmail/application.py:1189
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr "od %s"
 
-#: ayatanawebmail/application.py:1202
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr "Nova pošta od %s"
 
-#: ayatanawebmail/dialog.py:60
-msgid "Web page"
-msgstr "Spletna stran"
-
-#: ayatanawebmail/dialog.py:61
-msgid "Command"
-msgstr "Ukaz"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
+msgstr ""
 
-#: ayatanawebmail/dialog.py:93
+#: /ayatanawebmail/dialog.py:61
 msgid ""
-"Append an additional string - you can use the $MSG_THREAD and $MSG_UID "
-"placeholders."
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:114 ayatanawebmail/dialog.py:128
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr "(Brez)"
 
-#: ayatanawebmail/dialog.py:156
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:164
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr "Računi"
 
-#: ayatanawebmail/dialog.py:165
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr "Možnosti"
 
-#: ayatanawebmail/dialog.py:166
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr "Podpora"
 
-#: ayatanawebmail/dialog.py:167
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr "O programu"
 
-#: ayatanawebmail/dialog.py:228
-msgid ""
-"Please visit the following link and enable access for less secure apps:"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:230
-msgid "Access blocked by Google"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:234
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:235
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr "Povezava je spodletela"
 
-#: ayatanawebmail/dialog.py:254
-msgid "Choose an account"
-msgstr "Izberite račun"
-
-#: ayatanawebmail/dialog.py:259
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr "Dodaj"
 
-#: ayatanawebmail/dialog.py:261
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr "Odstrani"
 
-#: ayatanawebmail/dialog.py:276
-msgid "Server data"
-msgstr "Podatki strežnika"
+#: /ayatanawebmail/dialog.py:276
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+msgstr ""
 
-#: ayatanawebmail/dialog.py:278
-msgid "Account data"
-msgstr "Podatki računa"
+#: /ayatanawebmail/dialog.py:278
+#, fuzzy
+msgid "Account:"
+msgstr "Računi"
 
-#: ayatanawebmail/dialog.py:289
-msgid "Links"
-msgstr "Povezave"
+#: /ayatanawebmail/dialog.py:280
+#, fuzzy
+msgid "Server:"
+msgstr "Podatki strežnika"
 
-#: ayatanawebmail/dialog.py:297
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr "Gostitelj:"
 
-#: ayatanawebmail/dialog.py:299
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr "Vrata:"
 
-#: ayatanawebmail/dialog.py:302
-msgid "Login:"
-msgstr "Prijava:"
+#: /ayatanawebmail/dialog.py:286
+msgid "Username:"
+msgstr ""
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr "Geslo:"
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr "Mape:"
 
-#: ayatanawebmail/dialog.py:309
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr "Dom:"
 
-#: ayatanawebmail/dialog.py:311
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr "Sestavi:"
 
-#: ayatanawebmail/dialog.py:313
+#: /ayatanawebmail/dialog.py:296
+msgid "Sent:"
+msgstr "Poslano:"
+
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr "Dohodna pošta:"
 
-#: ayatanawebmail/dialog.py:316
-msgid "Sent:"
-msgstr "Poslano:"
+#: /ayatanawebmail/dialog.py:300
+msgid "Message:"
+msgstr ""
 
-#: ayatanawebmail/dialog.py:354
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr "Označi sporočilo kot prebrano"
 
-#: ayatanawebmail/dialog.py:355
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:356
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr "Vedno vprašaj za potrditev"
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr "Omogoči obvestila:"
 
-#: ayatanawebmail/dialog.py:368
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:370
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:372
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:374
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:377
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:384
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr "Predvajanje zvoka po meri:"
 
-#: ayatanawebmail/dialog.py:400
-msgid "Report a bug/Request a feature"
+#: /ayatanawebmail/dialog.py:382
+msgid "Report a bug"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:384
+msgid "Request a feature"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
+#, python-brace-format
+msgid "It's a good idea to add the {labelname} label to your issue."
 msgstr ""
 
-#: ayatanawebmail/dialog.py:402
+#: /ayatanawebmail/dialog.py:387
 msgid "Ask a question"
 msgstr "Postavi vprašanje"
 
-#: ayatanawebmail/dialog.py:404
+#: /ayatanawebmail/dialog.py:390
 msgid "Help translate"
 msgstr "Pomoč pri prevajanjnu"
 
-#: ayatanawebmail/dialog.py:406
-msgid "Project page"
-msgstr "Stran projekta"
-
-#: ayatanawebmail/dialog.py:408
+#: /ayatanawebmail/dialog.py:392
 msgid "Source code"
 msgstr "Izvorna koda"
 
-#: ayatanawebmail/dialog.py:410
-msgid "Repository"
-msgstr "Skladišče"
-
-#: ayatanawebmail/dialog.py:412
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr "Domača stran"
 
-#: ayatanawebmail/dialog.py:426
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:39
-msgid "Webmail notifications and actions for any desktop"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:74
-msgid "Mark all as read"
-msgstr "Označi vse kot prebrano"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+#, fuzzy
+msgid "Enable notifications"
+msgstr "Omogoči obvestila:"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:112
-msgid "Compose Mail"
-msgstr "Sestavi pošto"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:152
-msgid "Sent"
-msgstr "Poslano"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+msgid "Play sound when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+msgid "Hide message count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+msgid "Run this command when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+#, fuzzy
+msgid "Custom sound"
+msgstr "Predvajanje zvoka po meri:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+msgid "Play a custom sound when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+#, fuzzy
+msgid "Merge messages"
+msgstr "Označi sporočilo kot prebrano"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+msgid "Merge messages belonging to the same conversation."
+msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:228
-msgid "Inbox"
-msgstr "Prejeto"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+msgid "Message action"
+msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+msgid "Action to perform when a message is activated."
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:38
-msgid "Display notifications about new mail"
-msgstr "Prikaži obvestila o novi pošti"
+#~ msgid "Web page"
+#~ msgstr "Spletna stran"
+
+#~ msgid "Command"
+#~ msgstr "Ukaz"
+
+#~ msgid "Choose an account"
+#~ msgstr "Izberite račun"
+
+#~ msgid "Account data"
+#~ msgstr "Podatki računa"
+
+#~ msgid "Links"
+#~ msgstr "Povezave"
+
+#~ msgid "Login:"
+#~ msgstr "Prijava:"
+
+#~ msgid "Project page"
+#~ msgstr "Stran projekta"
+
+#~ msgid "Repository"
+#~ msgstr "Skladišče"
+
+#~ msgid "Mark all as read"
+#~ msgstr "Označi vse kot prebrano"
+
+#~ msgid "Compose Mail"
+#~ msgstr "Sestavi pošto"
+
+#~ msgid "Sent"
+#~ msgstr "Poslano"
+
+#~ msgid "Inbox"
+#~ msgstr "Prejeto"
+
+#~ msgid "Display notifications about new mail"
+#~ msgstr "Prikaži obvestila o novi pošti"
diff --git a/po/sq.po b/po/sq.po
index c87c7a8..883007b 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -6,9 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail 22.6.28\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/"
-"issues\n"
-"POT-Creation-Date: 2020-08-22 20:15+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -18,300 +17,329 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr ""
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr ""
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr ""
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:204
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr ""
 
-#: ayatanawebmail/application.py:211
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr ""
 
-#: ayatanawebmail/application.py:218
-#: data/usr/share/applications/ayatana-webmail.desktop:35
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr ""
 
-#: ayatanawebmail/application.py:957
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:1110
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr ""
 
-#: ayatanawebmail/application.py:1111
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
-msgid "Unable to connect to account \"{accountName}\", the application will now exit."
+msgid ""
+"Unable to connect to account \"{accountName}\", the application will now "
+"exit."
 msgstr ""
 
-#: ayatanawebmail/application.py:1136
+#: /ayatanawebmail/application.py:1131
 #, python-format
-msgid "You have %d unread mail"
-msgid_plural "You have %d unread mails"
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ayatanawebmail/application.py:1163
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr ""
 
-#: ayatanawebmail/application.py:1165
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1167
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1180
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:60
-msgid "If this string starts with http:// or https://, the application will open it in your browser - otherwise, it will be run as a command"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:61
+msgid ""
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:90 ayatanawebmail/dialog.py:104
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:132
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:140
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:141
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:142
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:143
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:204
-msgid "Please visit the following link and enable access for less secure apps:"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:206
-msgid "Access blocked by Google"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:210
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:211
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:234
-msgid "Custom"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:242
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:244
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:286
-msgid "The application will append this string to \"Inbox\" to access a specific message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+#: /ayatanawebmail/dialog.py:276
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:288
+#: /ayatanawebmail/dialog.py:278
 msgid "Account:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:290
+#: /ayatanawebmail/dialog.py:280
 msgid "Server:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:292
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:294
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:296
+#: /ayatanawebmail/dialog.py:286
 msgid "Username:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:298
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:300
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:302
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:296
 msgid "Sent:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:308
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:310
+#: /ayatanawebmail/dialog.py:300
 msgid "Message:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:346
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:347
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:348
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:358
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:360
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:362
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:364
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:369
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:376
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:392
+#: /ayatanawebmail/dialog.py:382
 msgid "Report a bug"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:394
+#: /ayatanawebmail/dialog.py:384
 msgid "Request a feature"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:396 ayatanawebmail/dialog.py:399
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
 #, python-brace-format
 msgid "It's a good idea to add the {labelname} label to your issue."
 msgstr ""
 
-#: ayatanawebmail/dialog.py:397
+#: /ayatanawebmail/dialog.py:387
 msgid "Ask a question"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:400
+#: /ayatanawebmail/dialog.py:390
 msgid "Help translate"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:402
+#: /ayatanawebmail/dialog.py:392
 msgid "Source code"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:404
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:424
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+msgid "Enable notifications"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+msgid "Play sound when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+msgid "Hide message count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:5
-msgid "Display notifications about new mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+msgid "Run this command when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+msgid "Custom sound"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:5
-msgid "Webmail notifications and actions for any desktop"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+msgid "Play a custom sound when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:15
-msgid "Mark all as read"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+msgid "Merge messages"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:20
-msgid "Compose Mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+msgid "Merge messages belonging to the same conversation."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:25
-msgid "Sent"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+msgid "Message action"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:30
-msgid "Inbox"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+msgid "Action to perform when a message is activated."
 msgstr ""
diff --git a/po/sr.po b/po/sr.po
index d51b250..01375ed 100755
--- a/po/sr.po
+++ b/po/sr.po
@@ -6,326 +6,374 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/issues\n"
-"POT-Creation-Date: 2020-04-03 12:21+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: 2018-06-04 07:33+0000\n"
 "Language-Team: Serbian <gnom@prevod.org>\n"
+"Language: sr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
-"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Launchpad-Export-Date: 2020-04-04 05:58+0000\n"
 "X-Generator: Launchpad (build a296f04231dee355be5db73cc878b9e21689a253)\n"
-"Language: sr\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr ""
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr ""
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr ""
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:205
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr ""
 
-#: ayatanawebmail/application.py:212
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr ""
 
-#: ayatanawebmail/application.py:219
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr ""
 
-#: ayatanawebmail/application.py:980
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr "Без теме"
 
-#: ayatanawebmail/application.py:1132
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr ""
 
-#: ayatanawebmail/application.py:1133
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
 msgid ""
 "Unable to connect to account \"{accountName}\", the application will now "
 "exit."
 msgstr ""
 
-#: ayatanawebmail/application.py:1133
-#, python-brace-format
-msgid "You can run \"{command}\" to delete all your login settings."
-msgstr ""
-
-#: ayatanawebmail/application.py:1158
-#, python-format
-msgid "You have %d unread mail"
-msgid_plural "You have %d unread mails"
+#: /ayatanawebmail/application.py:1131
+#, fuzzy, python-format
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
 msgstr[0] "Имате %d непрочитану поруку"
 msgstr[1] "Имате %d непрочитане поруке"
 msgstr[2] "Имате %d непрочитаних порука"
 
-#: ayatanawebmail/application.py:1185
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr "од %(t0)s и %(t1)s и осталих"
 
-#: ayatanawebmail/application.py:1187
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr "ос %(t0)s и %(t1)s"
 
-#: ayatanawebmail/application.py:1189
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr "од %s"
 
-#: ayatanawebmail/application.py:1202
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr "%s је послао нову поруку"
 
-#: ayatanawebmail/dialog.py:60
-msgid "Web page"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:61
-msgid "Command"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:93
+#: /ayatanawebmail/dialog.py:61
 msgid ""
-"Append an additional string - you can use the $MSG_THREAD and $MSG_UID "
-"placeholders."
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:114 ayatanawebmail/dialog.py:128
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:156
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr "Поставке поште Јунитија"
 
-#: ayatanawebmail/dialog.py:164
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr "Налози"
 
-#: ayatanawebmail/dialog.py:165
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr "Могућности"
 
-#: ayatanawebmail/dialog.py:166
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:167
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:228
-msgid ""
-"Please visit the following link and enable access for less secure apps:"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:230
-msgid "Access blocked by Google"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:234
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:235
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:254
-msgid "Choose an account"
-msgstr "Изаберите налог"
-
-#: ayatanawebmail/dialog.py:259
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:261
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:276
-msgid "Server data"
-msgstr "Подаци о серверу"
+#: /ayatanawebmail/dialog.py:276
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+msgstr ""
 
-#: ayatanawebmail/dialog.py:278
-msgid "Account data"
-msgstr "Подаци о налогу"
+#: /ayatanawebmail/dialog.py:278
+#, fuzzy
+msgid "Account:"
+msgstr "Налози"
 
-#: ayatanawebmail/dialog.py:289
-msgid "Links"
-msgstr ""
+#: /ayatanawebmail/dialog.py:280
+#, fuzzy
+msgid "Server:"
+msgstr "Подаци о серверу"
 
-#: ayatanawebmail/dialog.py:297
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr "Домаћин:"
 
-#: ayatanawebmail/dialog.py:299
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr "Прикључник:"
 
-#: ayatanawebmail/dialog.py:302
-msgid "Login:"
-msgstr "Пријава:"
+#: /ayatanawebmail/dialog.py:286
+msgid "Username:"
+msgstr ""
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr "Лозинка:"
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:309
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr "Почетна:"
 
-#: ayatanawebmail/dialog.py:311
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr "Састави:"
 
-#: ayatanawebmail/dialog.py:313
+#: /ayatanawebmail/dialog.py:296
+msgid "Sent:"
+msgstr "Послато:"
+
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr "Примљено:"
 
-#: ayatanawebmail/dialog.py:316
-msgid "Sent:"
-msgstr "Послато:"
+#: /ayatanawebmail/dialog.py:300
+msgid "Message:"
+msgstr ""
 
-#: ayatanawebmail/dialog.py:354
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:355
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:356
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr "Омогући обавештења:"
 
-#: ayatanawebmail/dialog.py:368
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:370
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:372
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:374
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:377
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:384
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr "Произвољни звук за пуштање:"
 
-#: ayatanawebmail/dialog.py:400
-msgid "Report a bug/Request a feature"
+#: /ayatanawebmail/dialog.py:382
+msgid "Report a bug"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:402
-msgid "Ask a question"
+#: /ayatanawebmail/dialog.py:384
+msgid "Request a feature"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:404
-msgid "Help translate"
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
+#, python-brace-format
+msgid "It's a good idea to add the {labelname} label to your issue."
 msgstr ""
 
-#: ayatanawebmail/dialog.py:406
-msgid "Project page"
+#: /ayatanawebmail/dialog.py:387
+msgid "Ask a question"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:408
-msgid "Source code"
+#: /ayatanawebmail/dialog.py:390
+msgid "Help translate"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:410
-msgid "Repository"
+#: /ayatanawebmail/dialog.py:392
+msgid "Source code"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:412
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:426
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
-msgstr "Пошта Јунитија"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+#, fuzzy
+msgid "Enable notifications"
+msgstr "Омогући обавештења:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+msgid "Play sound when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+msgid "Hide message count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+msgid "Run this command when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+#, fuzzy
+msgid "Custom sound"
+msgstr "Произвољни звук за пуштање:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+msgid "Play a custom sound when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+msgid "Merge messages"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+msgid "Merge messages belonging to the same conversation."
+msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:39
-msgid "Webmail notifications and actions for any desktop"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+msgid "Message action"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:74
-msgid "Mark all as read"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+msgid "Action to perform when a message is activated."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:112
-msgid "Compose Mail"
-msgstr "Саставите поруку"
+#~ msgid "Choose an account"
+#~ msgstr "Изаберите налог"
+
+#~ msgid "Account data"
+#~ msgstr "Подаци о налогу"
+
+#~ msgid "Login:"
+#~ msgstr "Пријава:"
+
+#~ msgid "Ayatana Webmail"
+#~ msgstr "Пошта Јунитија"
+
+#~ msgid "Compose Mail"
+#~ msgstr "Саставите поруку"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:152
-msgid "Sent"
-msgstr "Послато"
+#~ msgid "Sent"
+#~ msgstr "Послато"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:228
-msgid "Inbox"
-msgstr "Пријемно сандуче"
+#~ msgid "Inbox"
+#~ msgstr "Пријемно сандуче"
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
-msgstr "Пошта Јунитија (услуга)"
+#~ msgid "Ayatana Webmail (service)"
+#~ msgstr "Пошта Јунитија (услуга)"
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:38
-msgid "Display notifications about new mail"
-msgstr "Приказује обавештења о новој пошти"
+#~ msgid "Display notifications about new mail"
+#~ msgstr "Приказује обавештења о новој пошти"
diff --git a/po/sv.po b/po/sv.po
index e8ad23f..677fb93 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -6,13 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail 22.6.28\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/"
-"issues\n"
-"POT-Creation-Date: 2020-08-22 20:15+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: 2020-12-24 10:29+0000\n"
 "Last-Translator: Anders Jonsson <anders.jonsson@norsjovallen.se>\n"
-"Language-Team: Swedish <https://hosted.weblate.org/projects/"
-"ayatana-indicators/ayatana-webmail/sv/>\n"
+"Language-Team: Swedish <https://hosted.weblate.org/projects/ayatana-"
+"indicators/ayatana-webmail/sv/>\n"
 "Language: sv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,309 +19,379 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 4.4.1-dev\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr "Välj konto"
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr "Vilket kontos kommando/webbsida vill du öppna?"
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr "Meddelandeåtgärder"
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr "Ta bort"
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr "Markera som läst"
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr "Öppna meddelande/Kör kommando"
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr "Avsändare"
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr "Ämne"
 
-#: ayatanawebmail/application.py:204
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr "Öppna hemsidan för webbmail"
 
-#: ayatanawebmail/application.py:211
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr "Rensa"
 
-#: ayatanawebmail/application.py:218
-#: data/usr/share/applications/ayatana-webmail.desktop:35
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr "Inställningar"
 
-#: ayatanawebmail/application.py:957
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr "Inget ämne"
 
-#: ayatanawebmail/application.py:1110
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr "Anslutningsfel"
 
-#: ayatanawebmail/application.py:1111
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
-msgid "Unable to connect to account \"{accountName}\", the application will now exit."
+msgid ""
+"Unable to connect to account \"{accountName}\", the application will now "
+"exit."
 msgstr ""
 "Kunde inte ansluta till konto \"{accountName}\", applikationen kommer att "
 "avslutas nu."
 
-#: ayatanawebmail/application.py:1136
-#, python-format
-msgid "You have %d unread mail"
-msgid_plural "You have %d unread mails"
+#: /ayatanawebmail/application.py:1131
+#, fuzzy, python-format
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
 msgstr[0] "Du har %d oläst mail"
 msgstr[1] "Du har %d olästa mail"
 
-#: ayatanawebmail/application.py:1163
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr "från %(t0)s,%(t1)s och andra"
 
-#: ayatanawebmail/application.py:1165
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr "från %(t0)s och %(t1)s"
 
-#: ayatanawebmail/application.py:1167
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr "från %s"
 
-#: ayatanawebmail/application.py:1180
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr "Nya mail från %s"
 
-#: ayatanawebmail/dialog.py:60
-msgid "If this string starts with http:// or https://, the application will open it in your browser - otherwise, it will be run as a command"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
+msgstr "Anpassad"
+
+#: /ayatanawebmail/dialog.py:61
+msgid ""
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
 "Om den här strängen börjar med http:// eller https:// öppnar applikationen "
 "den i din webbläsare - annars körs den som ett kommando"
 
-#: ayatanawebmail/dialog.py:90 ayatanawebmail/dialog.py:104
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr "(inga)"
 
-#: ayatanawebmail/dialog.py:132
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr "Ayatana Webmail Inställningar"
 
-#: ayatanawebmail/dialog.py:140
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr "Konton"
 
-#: ayatanawebmail/dialog.py:141
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr "Alternativ"
 
-#: ayatanawebmail/dialog.py:142
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr "Support"
 
-#: ayatanawebmail/dialog.py:143
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr "Om"
 
-#: ayatanawebmail/dialog.py:204
-msgid "Please visit the following link and enable access for less secure apps:"
-msgstr "Besök följande länk och aktivera åtkomst för mindre säkra appar:"
-
-#: ayatanawebmail/dialog.py:206
-msgid "Access blocked by Google"
-msgstr "Åtkomst blockerad av Google"
-
-#: ayatanawebmail/dialog.py:210
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr ""
 "Misslyckades med att ansluta till e-postkonto. Det returnerade felet var:"
 
-#: ayatanawebmail/dialog.py:211
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr "Anslutningsfel"
 
-#: ayatanawebmail/dialog.py:234
-msgid "Custom"
-msgstr "Anpassad"
-
-#: ayatanawebmail/dialog.py:242
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr "Lägg till"
 
-#: ayatanawebmail/dialog.py:244
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr "Ta bort"
 
-#: ayatanawebmail/dialog.py:286
-msgid "The application will append this string to \"Inbox\" to access a specific message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+#: /ayatanawebmail/dialog.py:276
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
 msgstr ""
 "Applikationen lägger till den här strängen i \"Inkorgen\" för att komma åt "
 "ett specifikt meddelande - du kan använda platshållarna $MSG_THREAD och $ "
 "MSG_UID"
 
-#: ayatanawebmail/dialog.py:288
+#: /ayatanawebmail/dialog.py:278
 msgid "Account:"
 msgstr "Konto:"
 
-#: ayatanawebmail/dialog.py:290
+#: /ayatanawebmail/dialog.py:280
 msgid "Server:"
 msgstr "Server:"
 
-#: ayatanawebmail/dialog.py:292
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr "Värdnamn:"
 
-#: ayatanawebmail/dialog.py:294
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr "Port:"
 
-#: ayatanawebmail/dialog.py:296
+#: /ayatanawebmail/dialog.py:286
 msgid "Username:"
 msgstr "Användarnamn:"
 
-#: ayatanawebmail/dialog.py:298
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr "Lösenord:"
 
-#: ayatanawebmail/dialog.py:300
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr "Mappar:"
 
-#: ayatanawebmail/dialog.py:302
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr "Hem:"
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr "Skriv:"
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:296
 msgid "Sent:"
 msgstr "Skickat:"
 
-#: ayatanawebmail/dialog.py:308
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr "Inkorg:"
 
-#: ayatanawebmail/dialog.py:310
+#: /ayatanawebmail/dialog.py:300
 msgid "Message:"
 msgstr "Meddelande:"
 
-#: ayatanawebmail/dialog.py:346
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr "Markera meddelande som läst"
 
-#: ayatanawebmail/dialog.py:347
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr "Öppna meddelandet i webbläsaren/Kör kommando"
 
-#: ayatanawebmail/dialog.py:348
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr "Fråga mig vad jag vill göra"
 
-#: ayatanawebmail/dialog.py:358
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr "Aktivera notifieringar:"
 
-#: ayatanawebmail/dialog.py:360
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr "Spela ett ljud när ett meddelande är mottaget:"
 
-#: ayatanawebmail/dialog.py:362
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr "Sammanfoga meddelanden från samma konversation:"
 
-#: ayatanawebmail/dialog.py:364
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr "Dölj antal när noll:"
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr "När ett meddelande är aktiverat:"
 
-#: ayatanawebmail/dialog.py:369
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr "Utför detta kommando när ett meddelande har tagits emot:"
 
-#: ayatanawebmail/dialog.py:376
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr "Anpassat ljud att spela:"
 
-#: ayatanawebmail/dialog.py:392
+#: /ayatanawebmail/dialog.py:382
 msgid "Report a bug"
 msgstr "Rapportera en bugg"
 
-#: ayatanawebmail/dialog.py:394
+#: /ayatanawebmail/dialog.py:384
 msgid "Request a feature"
 msgstr "Fråga om en funktion"
 
-#: ayatanawebmail/dialog.py:396 ayatanawebmail/dialog.py:399
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
 #, python-brace-format
 msgid "It's a good idea to add the {labelname} label to your issue."
 msgstr ""
 "Det är en bra idé att lägga till etiketten {labelname} till ditt ärende."
 
-#: ayatanawebmail/dialog.py:397
+#: /ayatanawebmail/dialog.py:387
 msgid "Ask a question"
 msgstr "Ställ en fråga"
 
-#: ayatanawebmail/dialog.py:400
+#: /ayatanawebmail/dialog.py:390
 msgid "Help translate"
 msgstr "Hjälp till att översätta"
 
-#: ayatanawebmail/dialog.py:402
+#: /ayatanawebmail/dialog.py:392
 msgid "Source code"
 msgstr "Källkod"
 
-#: ayatanawebmail/dialog.py:404
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr "Hemsida"
 
-#: ayatanawebmail/dialog.py:424
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr "Luna Jernberg, 2020"
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
-msgstr "Ayatana Webmail (tjänst)"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+#, fuzzy
+msgid "Enable notifications"
+msgstr "Aktivera notifieringar:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+#, fuzzy
+msgid "Play sound when new messages arrive."
+msgstr "Spela ett ljud när ett meddelande är mottaget:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+#, fuzzy
+msgid "Hide message count"
+msgstr "Öppna meddelande/Kör kommando"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+#, fuzzy
+msgid "Run this command when new messages arrive."
+msgstr "Utför detta kommando när ett meddelande har tagits emot:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+#, fuzzy
+msgid "Custom sound"
+msgstr "Anpassat ljud att spela:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+#, fuzzy
+msgid "Play a custom sound when new messages arrive."
+msgstr "Spela ett ljud när ett meddelande är mottaget:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+#, fuzzy
+msgid "Merge messages"
+msgstr "Markera meddelande som läst"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+#, fuzzy
+msgid "Merge messages belonging to the same conversation."
+msgstr "Sammanfoga meddelanden från samma konversation:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+#, fuzzy
+msgid "Message action"
+msgstr "Meddelandeåtgärder"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+#, fuzzy
+msgid "Action to perform when a message is activated."
+msgstr "När ett meddelande är aktiverat:"
+
+#~ msgid ""
+#~ "Please visit the following link and enable access for less secure apps:"
+#~ msgstr "Besök följande länk och aktivera åtkomst för mindre säkra appar:"
+
+#~ msgid "Access blocked by Google"
+#~ msgstr "Åtkomst blockerad av Google"
+
+#~ msgid "Ayatana Webmail (service)"
+#~ msgstr "Ayatana Webmail (tjänst)"
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:5
-msgid "Display notifications about new mail"
-msgstr "Visa notifieringar om nya mail"
+#~ msgid "Display notifications about new mail"
+#~ msgstr "Visa notifieringar om nya mail"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
-msgstr "Ayatana Webmail"
+#~ msgid "Ayatana Webmail"
+#~ msgstr "Ayatana Webmail"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:5
-msgid "Webmail notifications and actions for any desktop"
-msgstr "Webmail-notifieringar och åtgärder för alla skrivbord"
+#~ msgid "Webmail notifications and actions for any desktop"
+#~ msgstr "Webmail-notifieringar och åtgärder för alla skrivbord"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:15
-msgid "Mark all as read"
-msgstr "Markera alla som lästa"
+#~ msgid "Mark all as read"
+#~ msgstr "Markera alla som lästa"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:20
-msgid "Compose Mail"
-msgstr "Skriv Mail"
+#~ msgid "Compose Mail"
+#~ msgstr "Skriv Mail"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:25
-msgid "Sent"
-msgstr "Skickat"
+#~ msgid "Sent"
+#~ msgstr "Skickat"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:30
-msgid "Inbox"
-msgstr "Inkorg"
+#~ msgid "Inbox"
+#~ msgstr "Inkorg"
diff --git a/po/sw.po b/po/sw.po
index 436698d..6e9e333 100644
--- a/po/sw.po
+++ b/po/sw.po
@@ -6,9 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail 22.6.28\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/"
-"issues\n"
-"POT-Creation-Date: 2020-08-22 20:15+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -18,300 +17,329 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr ""
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr ""
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr ""
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:204
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr ""
 
-#: ayatanawebmail/application.py:211
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr ""
 
-#: ayatanawebmail/application.py:218
-#: data/usr/share/applications/ayatana-webmail.desktop:35
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr ""
 
-#: ayatanawebmail/application.py:957
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:1110
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr ""
 
-#: ayatanawebmail/application.py:1111
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
-msgid "Unable to connect to account \"{accountName}\", the application will now exit."
+msgid ""
+"Unable to connect to account \"{accountName}\", the application will now "
+"exit."
 msgstr ""
 
-#: ayatanawebmail/application.py:1136
+#: /ayatanawebmail/application.py:1131
 #, python-format
-msgid "You have %d unread mail"
-msgid_plural "You have %d unread mails"
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ayatanawebmail/application.py:1163
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr ""
 
-#: ayatanawebmail/application.py:1165
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1167
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1180
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:60
-msgid "If this string starts with http:// or https://, the application will open it in your browser - otherwise, it will be run as a command"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:61
+msgid ""
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:90 ayatanawebmail/dialog.py:104
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:132
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:140
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:141
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:142
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:143
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:204
-msgid "Please visit the following link and enable access for less secure apps:"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:206
-msgid "Access blocked by Google"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:210
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:211
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:234
-msgid "Custom"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:242
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:244
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:286
-msgid "The application will append this string to \"Inbox\" to access a specific message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+#: /ayatanawebmail/dialog.py:276
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:288
+#: /ayatanawebmail/dialog.py:278
 msgid "Account:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:290
+#: /ayatanawebmail/dialog.py:280
 msgid "Server:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:292
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:294
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:296
+#: /ayatanawebmail/dialog.py:286
 msgid "Username:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:298
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:300
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:302
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:296
 msgid "Sent:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:308
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:310
+#: /ayatanawebmail/dialog.py:300
 msgid "Message:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:346
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:347
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:348
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:358
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:360
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:362
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:364
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:369
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:376
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:392
+#: /ayatanawebmail/dialog.py:382
 msgid "Report a bug"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:394
+#: /ayatanawebmail/dialog.py:384
 msgid "Request a feature"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:396 ayatanawebmail/dialog.py:399
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
 #, python-brace-format
 msgid "It's a good idea to add the {labelname} label to your issue."
 msgstr ""
 
-#: ayatanawebmail/dialog.py:397
+#: /ayatanawebmail/dialog.py:387
 msgid "Ask a question"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:400
+#: /ayatanawebmail/dialog.py:390
 msgid "Help translate"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:402
+#: /ayatanawebmail/dialog.py:392
 msgid "Source code"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:404
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:424
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+msgid "Enable notifications"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+msgid "Play sound when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+msgid "Hide message count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:5
-msgid "Display notifications about new mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+msgid "Run this command when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+msgid "Custom sound"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:5
-msgid "Webmail notifications and actions for any desktop"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+msgid "Play a custom sound when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:15
-msgid "Mark all as read"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+msgid "Merge messages"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:20
-msgid "Compose Mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+msgid "Merge messages belonging to the same conversation."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:25
-msgid "Sent"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+msgid "Message action"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:30
-msgid "Inbox"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+msgid "Action to perform when a message is activated."
 msgstr ""
diff --git a/po/szl.po b/po/szl.po
index acc8472..f3ea115 100644
--- a/po/szl.po
+++ b/po/szl.po
@@ -6,9 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail 22.6.28\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/"
-"issues\n"
-"POT-Creation-Date: 2020-08-22 20:15+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -19,301 +18,330 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2;\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr ""
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr ""
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr ""
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:204
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr ""
 
-#: ayatanawebmail/application.py:211
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr ""
 
-#: ayatanawebmail/application.py:218
-#: data/usr/share/applications/ayatana-webmail.desktop:35
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr ""
 
-#: ayatanawebmail/application.py:957
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:1110
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr ""
 
-#: ayatanawebmail/application.py:1111
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
-msgid "Unable to connect to account \"{accountName}\", the application will now exit."
+msgid ""
+"Unable to connect to account \"{accountName}\", the application will now "
+"exit."
 msgstr ""
 
-#: ayatanawebmail/application.py:1136
+#: /ayatanawebmail/application.py:1131
 #, python-format
-msgid "You have %d unread mail"
-msgid_plural "You have %d unread mails"
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: ayatanawebmail/application.py:1163
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr ""
 
-#: ayatanawebmail/application.py:1165
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1167
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1180
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:60
-msgid "If this string starts with http:// or https://, the application will open it in your browser - otherwise, it will be run as a command"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:61
+msgid ""
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:90 ayatanawebmail/dialog.py:104
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:132
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:140
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:141
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:142
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:143
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:204
-msgid "Please visit the following link and enable access for less secure apps:"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:206
-msgid "Access blocked by Google"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:210
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:211
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:234
-msgid "Custom"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:242
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:244
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:286
-msgid "The application will append this string to \"Inbox\" to access a specific message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+#: /ayatanawebmail/dialog.py:276
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:288
+#: /ayatanawebmail/dialog.py:278
 msgid "Account:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:290
+#: /ayatanawebmail/dialog.py:280
 msgid "Server:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:292
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:294
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:296
+#: /ayatanawebmail/dialog.py:286
 msgid "Username:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:298
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:300
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:302
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:296
 msgid "Sent:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:308
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:310
+#: /ayatanawebmail/dialog.py:300
 msgid "Message:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:346
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:347
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:348
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:358
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:360
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:362
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:364
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:369
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:376
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:392
+#: /ayatanawebmail/dialog.py:382
 msgid "Report a bug"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:394
+#: /ayatanawebmail/dialog.py:384
 msgid "Request a feature"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:396 ayatanawebmail/dialog.py:399
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
 #, python-brace-format
 msgid "It's a good idea to add the {labelname} label to your issue."
 msgstr ""
 
-#: ayatanawebmail/dialog.py:397
+#: /ayatanawebmail/dialog.py:387
 msgid "Ask a question"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:400
+#: /ayatanawebmail/dialog.py:390
 msgid "Help translate"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:402
+#: /ayatanawebmail/dialog.py:392
 msgid "Source code"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:404
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:424
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+msgid "Enable notifications"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+msgid "Play sound when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+msgid "Hide message count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:5
-msgid "Display notifications about new mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+msgid "Run this command when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+msgid "Custom sound"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:5
-msgid "Webmail notifications and actions for any desktop"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+msgid "Play a custom sound when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:15
-msgid "Mark all as read"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+msgid "Merge messages"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:20
-msgid "Compose Mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+msgid "Merge messages belonging to the same conversation."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:25
-msgid "Sent"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+msgid "Message action"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:30
-msgid "Inbox"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+msgid "Action to perform when a message is activated."
 msgstr ""
diff --git a/po/ta.po b/po/ta.po
index 5fc1749..4be39dc 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -6,9 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail 22.6.28\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/"
-"issues\n"
-"POT-Creation-Date: 2020-08-22 20:15+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -18,300 +17,329 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr ""
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr ""
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr ""
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:204
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr ""
 
-#: ayatanawebmail/application.py:211
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr ""
 
-#: ayatanawebmail/application.py:218
-#: data/usr/share/applications/ayatana-webmail.desktop:35
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr ""
 
-#: ayatanawebmail/application.py:957
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:1110
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr ""
 
-#: ayatanawebmail/application.py:1111
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
-msgid "Unable to connect to account \"{accountName}\", the application will now exit."
+msgid ""
+"Unable to connect to account \"{accountName}\", the application will now "
+"exit."
 msgstr ""
 
-#: ayatanawebmail/application.py:1136
+#: /ayatanawebmail/application.py:1131
 #, python-format
-msgid "You have %d unread mail"
-msgid_plural "You have %d unread mails"
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ayatanawebmail/application.py:1163
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr ""
 
-#: ayatanawebmail/application.py:1165
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1167
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1180
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:60
-msgid "If this string starts with http:// or https://, the application will open it in your browser - otherwise, it will be run as a command"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:61
+msgid ""
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:90 ayatanawebmail/dialog.py:104
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:132
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:140
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:141
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:142
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:143
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:204
-msgid "Please visit the following link and enable access for less secure apps:"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:206
-msgid "Access blocked by Google"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:210
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:211
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:234
-msgid "Custom"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:242
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:244
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:286
-msgid "The application will append this string to \"Inbox\" to access a specific message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+#: /ayatanawebmail/dialog.py:276
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:288
+#: /ayatanawebmail/dialog.py:278
 msgid "Account:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:290
+#: /ayatanawebmail/dialog.py:280
 msgid "Server:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:292
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:294
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:296
+#: /ayatanawebmail/dialog.py:286
 msgid "Username:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:298
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:300
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:302
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:296
 msgid "Sent:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:308
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:310
+#: /ayatanawebmail/dialog.py:300
 msgid "Message:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:346
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:347
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:348
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:358
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:360
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:362
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:364
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:369
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:376
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:392
+#: /ayatanawebmail/dialog.py:382
 msgid "Report a bug"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:394
+#: /ayatanawebmail/dialog.py:384
 msgid "Request a feature"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:396 ayatanawebmail/dialog.py:399
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
 #, python-brace-format
 msgid "It's a good idea to add the {labelname} label to your issue."
 msgstr ""
 
-#: ayatanawebmail/dialog.py:397
+#: /ayatanawebmail/dialog.py:387
 msgid "Ask a question"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:400
+#: /ayatanawebmail/dialog.py:390
 msgid "Help translate"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:402
+#: /ayatanawebmail/dialog.py:392
 msgid "Source code"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:404
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:424
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+msgid "Enable notifications"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+msgid "Play sound when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+msgid "Hide message count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:5
-msgid "Display notifications about new mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+msgid "Run this command when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+msgid "Custom sound"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:5
-msgid "Webmail notifications and actions for any desktop"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+msgid "Play a custom sound when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:15
-msgid "Mark all as read"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+msgid "Merge messages"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:20
-msgid "Compose Mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+msgid "Merge messages belonging to the same conversation."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:25
-msgid "Sent"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+msgid "Message action"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:30
-msgid "Inbox"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+msgid "Action to perform when a message is activated."
 msgstr ""
diff --git a/po/ta_LK.po b/po/ta_LK.po
index 4284af5..07ef679 100644
--- a/po/ta_LK.po
+++ b/po/ta_LK.po
@@ -6,9 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail 22.6.28\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/"
-"issues\n"
-"POT-Creation-Date: 2020-08-22 20:15+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -18,300 +17,329 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr ""
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr ""
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr ""
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:204
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr ""
 
-#: ayatanawebmail/application.py:211
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr ""
 
-#: ayatanawebmail/application.py:218
-#: data/usr/share/applications/ayatana-webmail.desktop:35
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr ""
 
-#: ayatanawebmail/application.py:957
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:1110
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr ""
 
-#: ayatanawebmail/application.py:1111
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
-msgid "Unable to connect to account \"{accountName}\", the application will now exit."
+msgid ""
+"Unable to connect to account \"{accountName}\", the application will now "
+"exit."
 msgstr ""
 
-#: ayatanawebmail/application.py:1136
+#: /ayatanawebmail/application.py:1131
 #, python-format
-msgid "You have %d unread mail"
-msgid_plural "You have %d unread mails"
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ayatanawebmail/application.py:1163
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr ""
 
-#: ayatanawebmail/application.py:1165
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1167
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1180
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:60
-msgid "If this string starts with http:// or https://, the application will open it in your browser - otherwise, it will be run as a command"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:61
+msgid ""
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:90 ayatanawebmail/dialog.py:104
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:132
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:140
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:141
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:142
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:143
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:204
-msgid "Please visit the following link and enable access for less secure apps:"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:206
-msgid "Access blocked by Google"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:210
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:211
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:234
-msgid "Custom"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:242
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:244
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:286
-msgid "The application will append this string to \"Inbox\" to access a specific message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+#: /ayatanawebmail/dialog.py:276
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:288
+#: /ayatanawebmail/dialog.py:278
 msgid "Account:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:290
+#: /ayatanawebmail/dialog.py:280
 msgid "Server:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:292
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:294
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:296
+#: /ayatanawebmail/dialog.py:286
 msgid "Username:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:298
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:300
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:302
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:296
 msgid "Sent:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:308
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:310
+#: /ayatanawebmail/dialog.py:300
 msgid "Message:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:346
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:347
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:348
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:358
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:360
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:362
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:364
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:369
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:376
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:392
+#: /ayatanawebmail/dialog.py:382
 msgid "Report a bug"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:394
+#: /ayatanawebmail/dialog.py:384
 msgid "Request a feature"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:396 ayatanawebmail/dialog.py:399
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
 #, python-brace-format
 msgid "It's a good idea to add the {labelname} label to your issue."
 msgstr ""
 
-#: ayatanawebmail/dialog.py:397
+#: /ayatanawebmail/dialog.py:387
 msgid "Ask a question"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:400
+#: /ayatanawebmail/dialog.py:390
 msgid "Help translate"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:402
+#: /ayatanawebmail/dialog.py:392
 msgid "Source code"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:404
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:424
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+msgid "Enable notifications"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+msgid "Play sound when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+msgid "Hide message count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:5
-msgid "Display notifications about new mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+msgid "Run this command when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+msgid "Custom sound"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:5
-msgid "Webmail notifications and actions for any desktop"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+msgid "Play a custom sound when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:15
-msgid "Mark all as read"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+msgid "Merge messages"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:20
-msgid "Compose Mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+msgid "Merge messages belonging to the same conversation."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:25
-msgid "Sent"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+msgid "Message action"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:30
-msgid "Inbox"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+msgid "Action to perform when a message is activated."
 msgstr ""
diff --git a/po/te.po b/po/te.po
index 23156d1..7896191 100644
--- a/po/te.po
+++ b/po/te.po
@@ -6,9 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail 22.6.28\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/"
-"issues\n"
-"POT-Creation-Date: 2020-08-22 20:15+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -18,300 +17,329 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr ""
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr ""
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr ""
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:204
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr ""
 
-#: ayatanawebmail/application.py:211
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr ""
 
-#: ayatanawebmail/application.py:218
-#: data/usr/share/applications/ayatana-webmail.desktop:35
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr ""
 
-#: ayatanawebmail/application.py:957
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:1110
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr ""
 
-#: ayatanawebmail/application.py:1111
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
-msgid "Unable to connect to account \"{accountName}\", the application will now exit."
+msgid ""
+"Unable to connect to account \"{accountName}\", the application will now "
+"exit."
 msgstr ""
 
-#: ayatanawebmail/application.py:1136
+#: /ayatanawebmail/application.py:1131
 #, python-format
-msgid "You have %d unread mail"
-msgid_plural "You have %d unread mails"
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ayatanawebmail/application.py:1163
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr ""
 
-#: ayatanawebmail/application.py:1165
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1167
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1180
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:60
-msgid "If this string starts with http:// or https://, the application will open it in your browser - otherwise, it will be run as a command"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:61
+msgid ""
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:90 ayatanawebmail/dialog.py:104
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:132
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:140
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:141
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:142
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:143
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:204
-msgid "Please visit the following link and enable access for less secure apps:"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:206
-msgid "Access blocked by Google"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:210
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:211
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:234
-msgid "Custom"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:242
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:244
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:286
-msgid "The application will append this string to \"Inbox\" to access a specific message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+#: /ayatanawebmail/dialog.py:276
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:288
+#: /ayatanawebmail/dialog.py:278
 msgid "Account:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:290
+#: /ayatanawebmail/dialog.py:280
 msgid "Server:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:292
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:294
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:296
+#: /ayatanawebmail/dialog.py:286
 msgid "Username:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:298
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:300
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:302
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:296
 msgid "Sent:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:308
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:310
+#: /ayatanawebmail/dialog.py:300
 msgid "Message:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:346
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:347
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:348
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:358
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:360
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:362
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:364
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:369
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:376
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:392
+#: /ayatanawebmail/dialog.py:382
 msgid "Report a bug"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:394
+#: /ayatanawebmail/dialog.py:384
 msgid "Request a feature"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:396 ayatanawebmail/dialog.py:399
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
 #, python-brace-format
 msgid "It's a good idea to add the {labelname} label to your issue."
 msgstr ""
 
-#: ayatanawebmail/dialog.py:397
+#: /ayatanawebmail/dialog.py:387
 msgid "Ask a question"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:400
+#: /ayatanawebmail/dialog.py:390
 msgid "Help translate"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:402
+#: /ayatanawebmail/dialog.py:392
 msgid "Source code"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:404
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:424
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+msgid "Enable notifications"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+msgid "Play sound when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+msgid "Hide message count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:5
-msgid "Display notifications about new mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+msgid "Run this command when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+msgid "Custom sound"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:5
-msgid "Webmail notifications and actions for any desktop"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+msgid "Play a custom sound when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:15
-msgid "Mark all as read"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+msgid "Merge messages"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:20
-msgid "Compose Mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+msgid "Merge messages belonging to the same conversation."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:25
-msgid "Sent"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+msgid "Message action"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:30
-msgid "Inbox"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+msgid "Action to perform when a message is activated."
 msgstr ""
diff --git a/po/tg.po b/po/tg.po
index 28e0564..53f0052 100644
--- a/po/tg.po
+++ b/po/tg.po
@@ -6,9 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail 22.6.28\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/"
-"issues\n"
-"POT-Creation-Date: 2020-08-22 20:15+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -18,299 +17,328 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr ""
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr ""
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr ""
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:204
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr ""
 
-#: ayatanawebmail/application.py:211
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr ""
 
-#: ayatanawebmail/application.py:218
-#: data/usr/share/applications/ayatana-webmail.desktop:35
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr ""
 
-#: ayatanawebmail/application.py:957
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:1110
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr ""
 
-#: ayatanawebmail/application.py:1111
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
-msgid "Unable to connect to account \"{accountName}\", the application will now exit."
+msgid ""
+"Unable to connect to account \"{accountName}\", the application will now "
+"exit."
 msgstr ""
 
-#: ayatanawebmail/application.py:1136
+#: /ayatanawebmail/application.py:1131
 #, python-format
-msgid "You have %d unread mail"
-msgid_plural "You have %d unread mails"
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
 msgstr[0] ""
 
-#: ayatanawebmail/application.py:1163
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr ""
 
-#: ayatanawebmail/application.py:1165
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1167
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1180
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:60
-msgid "If this string starts with http:// or https://, the application will open it in your browser - otherwise, it will be run as a command"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:61
+msgid ""
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:90 ayatanawebmail/dialog.py:104
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:132
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:140
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:141
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:142
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:143
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:204
-msgid "Please visit the following link and enable access for less secure apps:"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:206
-msgid "Access blocked by Google"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:210
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:211
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:234
-msgid "Custom"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:242
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:244
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:286
-msgid "The application will append this string to \"Inbox\" to access a specific message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+#: /ayatanawebmail/dialog.py:276
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:288
+#: /ayatanawebmail/dialog.py:278
 msgid "Account:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:290
+#: /ayatanawebmail/dialog.py:280
 msgid "Server:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:292
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:294
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:296
+#: /ayatanawebmail/dialog.py:286
 msgid "Username:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:298
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:300
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:302
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:296
 msgid "Sent:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:308
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:310
+#: /ayatanawebmail/dialog.py:300
 msgid "Message:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:346
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:347
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:348
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:358
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:360
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:362
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:364
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:369
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:376
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:392
+#: /ayatanawebmail/dialog.py:382
 msgid "Report a bug"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:394
+#: /ayatanawebmail/dialog.py:384
 msgid "Request a feature"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:396 ayatanawebmail/dialog.py:399
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
 #, python-brace-format
 msgid "It's a good idea to add the {labelname} label to your issue."
 msgstr ""
 
-#: ayatanawebmail/dialog.py:397
+#: /ayatanawebmail/dialog.py:387
 msgid "Ask a question"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:400
+#: /ayatanawebmail/dialog.py:390
 msgid "Help translate"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:402
+#: /ayatanawebmail/dialog.py:392
 msgid "Source code"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:404
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:424
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+msgid "Enable notifications"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+msgid "Play sound when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+msgid "Hide message count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:5
-msgid "Display notifications about new mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+msgid "Run this command when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+msgid "Custom sound"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:5
-msgid "Webmail notifications and actions for any desktop"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+msgid "Play a custom sound when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:15
-msgid "Mark all as read"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+msgid "Merge messages"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:20
-msgid "Compose Mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+msgid "Merge messages belonging to the same conversation."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:25
-msgid "Sent"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+msgid "Message action"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:30
-msgid "Inbox"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+msgid "Action to perform when a message is activated."
 msgstr ""
diff --git a/po/th.po b/po/th.po
index 8860ad7..e60afe7 100644
--- a/po/th.po
+++ b/po/th.po
@@ -6,9 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail 22.6.28\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/"
-"issues\n"
-"POT-Creation-Date: 2020-08-22 20:15+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -18,299 +17,328 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr ""
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr ""
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr ""
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:204
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr ""
 
-#: ayatanawebmail/application.py:211
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr ""
 
-#: ayatanawebmail/application.py:218
-#: data/usr/share/applications/ayatana-webmail.desktop:35
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr ""
 
-#: ayatanawebmail/application.py:957
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:1110
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr ""
 
-#: ayatanawebmail/application.py:1111
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
-msgid "Unable to connect to account \"{accountName}\", the application will now exit."
+msgid ""
+"Unable to connect to account \"{accountName}\", the application will now "
+"exit."
 msgstr ""
 
-#: ayatanawebmail/application.py:1136
+#: /ayatanawebmail/application.py:1131
 #, python-format
-msgid "You have %d unread mail"
-msgid_plural "You have %d unread mails"
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
 msgstr[0] ""
 
-#: ayatanawebmail/application.py:1163
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr ""
 
-#: ayatanawebmail/application.py:1165
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1167
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1180
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:60
-msgid "If this string starts with http:// or https://, the application will open it in your browser - otherwise, it will be run as a command"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:61
+msgid ""
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:90 ayatanawebmail/dialog.py:104
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:132
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:140
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:141
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:142
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:143
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:204
-msgid "Please visit the following link and enable access for less secure apps:"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:206
-msgid "Access blocked by Google"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:210
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:211
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:234
-msgid "Custom"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:242
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:244
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:286
-msgid "The application will append this string to \"Inbox\" to access a specific message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+#: /ayatanawebmail/dialog.py:276
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:288
+#: /ayatanawebmail/dialog.py:278
 msgid "Account:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:290
+#: /ayatanawebmail/dialog.py:280
 msgid "Server:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:292
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:294
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:296
+#: /ayatanawebmail/dialog.py:286
 msgid "Username:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:298
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:300
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:302
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:296
 msgid "Sent:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:308
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:310
+#: /ayatanawebmail/dialog.py:300
 msgid "Message:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:346
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:347
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:348
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:358
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:360
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:362
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:364
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:369
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:376
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:392
+#: /ayatanawebmail/dialog.py:382
 msgid "Report a bug"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:394
+#: /ayatanawebmail/dialog.py:384
 msgid "Request a feature"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:396 ayatanawebmail/dialog.py:399
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
 #, python-brace-format
 msgid "It's a good idea to add the {labelname} label to your issue."
 msgstr ""
 
-#: ayatanawebmail/dialog.py:397
+#: /ayatanawebmail/dialog.py:387
 msgid "Ask a question"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:400
+#: /ayatanawebmail/dialog.py:390
 msgid "Help translate"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:402
+#: /ayatanawebmail/dialog.py:392
 msgid "Source code"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:404
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:424
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+msgid "Enable notifications"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+msgid "Play sound when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+msgid "Hide message count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:5
-msgid "Display notifications about new mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+msgid "Run this command when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+msgid "Custom sound"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:5
-msgid "Webmail notifications and actions for any desktop"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+msgid "Play a custom sound when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:15
-msgid "Mark all as read"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+msgid "Merge messages"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:20
-msgid "Compose Mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+msgid "Merge messages belonging to the same conversation."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:25
-msgid "Sent"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+msgid "Message action"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:30
-msgid "Inbox"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+msgid "Action to perform when a message is activated."
 msgstr ""
diff --git a/po/ti.po b/po/ti.po
index d0e0473..aa4c6bc 100644
--- a/po/ti.po
+++ b/po/ti.po
@@ -6,9 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail 22.6.28\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/"
-"issues\n"
-"POT-Creation-Date: 2020-08-22 20:15+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -18,300 +17,329 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr ""
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr ""
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr ""
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:204
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr ""
 
-#: ayatanawebmail/application.py:211
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr ""
 
-#: ayatanawebmail/application.py:218
-#: data/usr/share/applications/ayatana-webmail.desktop:35
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr ""
 
-#: ayatanawebmail/application.py:957
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:1110
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr ""
 
-#: ayatanawebmail/application.py:1111
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
-msgid "Unable to connect to account \"{accountName}\", the application will now exit."
+msgid ""
+"Unable to connect to account \"{accountName}\", the application will now "
+"exit."
 msgstr ""
 
-#: ayatanawebmail/application.py:1136
+#: /ayatanawebmail/application.py:1131
 #, python-format
-msgid "You have %d unread mail"
-msgid_plural "You have %d unread mails"
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ayatanawebmail/application.py:1163
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr ""
 
-#: ayatanawebmail/application.py:1165
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1167
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1180
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:60
-msgid "If this string starts with http:// or https://, the application will open it in your browser - otherwise, it will be run as a command"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:61
+msgid ""
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:90 ayatanawebmail/dialog.py:104
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:132
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:140
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:141
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:142
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:143
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:204
-msgid "Please visit the following link and enable access for less secure apps:"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:206
-msgid "Access blocked by Google"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:210
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:211
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:234
-msgid "Custom"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:242
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:244
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:286
-msgid "The application will append this string to \"Inbox\" to access a specific message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+#: /ayatanawebmail/dialog.py:276
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:288
+#: /ayatanawebmail/dialog.py:278
 msgid "Account:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:290
+#: /ayatanawebmail/dialog.py:280
 msgid "Server:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:292
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:294
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:296
+#: /ayatanawebmail/dialog.py:286
 msgid "Username:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:298
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:300
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:302
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:296
 msgid "Sent:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:308
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:310
+#: /ayatanawebmail/dialog.py:300
 msgid "Message:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:346
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:347
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:348
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:358
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:360
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:362
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:364
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:369
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:376
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:392
+#: /ayatanawebmail/dialog.py:382
 msgid "Report a bug"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:394
+#: /ayatanawebmail/dialog.py:384
 msgid "Request a feature"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:396 ayatanawebmail/dialog.py:399
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
 #, python-brace-format
 msgid "It's a good idea to add the {labelname} label to your issue."
 msgstr ""
 
-#: ayatanawebmail/dialog.py:397
+#: /ayatanawebmail/dialog.py:387
 msgid "Ask a question"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:400
+#: /ayatanawebmail/dialog.py:390
 msgid "Help translate"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:402
+#: /ayatanawebmail/dialog.py:392
 msgid "Source code"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:404
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:424
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+msgid "Enable notifications"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+msgid "Play sound when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+msgid "Hide message count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:5
-msgid "Display notifications about new mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+msgid "Run this command when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+msgid "Custom sound"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:5
-msgid "Webmail notifications and actions for any desktop"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+msgid "Play a custom sound when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:15
-msgid "Mark all as read"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+msgid "Merge messages"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:20
-msgid "Compose Mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+msgid "Merge messages belonging to the same conversation."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:25
-msgid "Sent"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+msgid "Message action"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:30
-msgid "Inbox"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+msgid "Action to perform when a message is activated."
 msgstr ""
diff --git a/po/tr.po b/po/tr.po
index 682db96..2ddda16 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -6,13 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/"
-"issues\n"
-"POT-Creation-Date: 2020-04-03 12:21+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: 2020-12-02 19:29+0000\n"
 "Last-Translator: Oğuz Ersen <oguzersen@protonmail.com>\n"
-"Language-Team: Turkish <https://hosted.weblate.org/projects/"
-"ayatana-indicators/ayatana-webmail/tr/>\n"
+"Language-Team: Turkish <https://hosted.weblate.org/projects/ayatana-"
+"indicators/ayatana-webmail/tr/>\n"
 "Language: tr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,318 +20,409 @@ msgstr ""
 "X-Generator: Weblate 4.4-dev\n"
 "X-Launchpad-Export-Date: 2020-04-04 05:58+0000\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr "Hesap seç"
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr "Hangi hesabın komutunu/web sayfasını açmak istiyorsunuz?"
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr "Mesaj eylemleri"
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr "Sil"
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr "Okundu olarak işaretle"
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr "Mesajı aç /Komutu çalıştır"
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr "Gönderen"
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr "Konu"
 
-#: ayatanawebmail/application.py:205
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr "Web e-posta ana sayfasını aç"
 
-#: ayatanawebmail/application.py:212
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr "Temizle"
 
-#: ayatanawebmail/application.py:219
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr "Ayarlar"
 
-#: ayatanawebmail/application.py:980
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr "Başlık yok"
 
-#: ayatanawebmail/application.py:1132
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr "Bağlantı hatası"
 
-#: ayatanawebmail/application.py:1133
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
 msgid ""
 "Unable to connect to account \"{accountName}\", the application will now "
 "exit."
 msgstr "\"{accountName}\" hesabına bağlanılamadı, uygulama şimdi çıkacak."
 
-#: ayatanawebmail/application.py:1133
-#, python-brace-format
-msgid "You can run \"{command}\" to delete all your login settings."
-msgstr ""
-"Tüm oturum açma ayarlarınızı silmek için \"{command}\" komutunu "
-"çalıştırabilirsiniz."
-
-#: ayatanawebmail/application.py:1158
-#, python-format
-msgid "You have %d unread mail"
-msgid_plural "You have %d unread mails"
+#: /ayatanawebmail/application.py:1131
+#, fuzzy, python-format
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
 msgstr[0] "%d okunmamış e-postanız var"
 msgstr[1] "%d okunmamış e-postanız var"
 
-#: ayatanawebmail/application.py:1185
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr "%(t0)s, %(t1)s ve diğerlerinden"
 
-#: ayatanawebmail/application.py:1187
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr "%(t0)s ve %(t1)s'den"
 
-#: ayatanawebmail/application.py:1189
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr "%s'den"
 
-#: ayatanawebmail/application.py:1202
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr "%s kişisinden yeni e-posta"
 
-#: ayatanawebmail/dialog.py:60
-msgid "Web page"
-msgstr "Web sayfası"
-
-#: ayatanawebmail/dialog.py:61
-msgid "Command"
-msgstr "Komut"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
+msgstr ""
 
-#: ayatanawebmail/dialog.py:93
+#: /ayatanawebmail/dialog.py:61
 msgid ""
-"Append an additional string - you can use the $MSG_THREAD and $MSG_UID "
-"placeholders."
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
-"Ek bir dizge ekleyin - $MSG_THREAD ve $MSG_UID yer tutucularını "
-"kullanabilirsiniz."
 
-#: ayatanawebmail/dialog.py:114 ayatanawebmail/dialog.py:128
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr "(Yok)"
 
-#: ayatanawebmail/dialog.py:156
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr "Ayatana Webmail tercihleri"
 
-#: ayatanawebmail/dialog.py:164
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr "Hesaplar"
 
-#: ayatanawebmail/dialog.py:165
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr "Seçenekler"
 
-#: ayatanawebmail/dialog.py:166
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr "Destek"
 
-#: ayatanawebmail/dialog.py:167
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr "Hakkında"
 
-#: ayatanawebmail/dialog.py:228
-msgid ""
-"Please visit the following link and enable access for less secure apps:"
-msgstr ""
-"Lütfen aşağıdaki bağlantıyı ziyaret edin ve daha az güvenli uygulamalar için "
-"erişimi etkinleştirin:"
-
-#: ayatanawebmail/dialog.py:230
-msgid "Access blocked by Google"
-msgstr "Erişim Google tarafından engellendi"
-
-#: ayatanawebmail/dialog.py:234
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr "E-posta hesabına bağlanılamadı. Alınan hata:"
 
-#: ayatanawebmail/dialog.py:235
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr "Bağlantı hatası"
 
-#: ayatanawebmail/dialog.py:254
-msgid "Choose an account"
-msgstr "Bir hesap seçiniz"
-
-#: ayatanawebmail/dialog.py:259
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr "Ekle"
 
-#: ayatanawebmail/dialog.py:261
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr "Sil"
 
-#: ayatanawebmail/dialog.py:276
-msgid "Server data"
-msgstr "Sunucu bilgileri"
+#: /ayatanawebmail/dialog.py:276
+#, fuzzy
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+msgstr ""
+"Ek bir dizge ekleyin - $MSG_THREAD ve $MSG_UID yer tutucularını "
+"kullanabilirsiniz."
 
-#: ayatanawebmail/dialog.py:278
-msgid "Account data"
-msgstr "Hesap bilgileri"
+#: /ayatanawebmail/dialog.py:278
+#, fuzzy
+msgid "Account:"
+msgstr "Hesaplar"
 
-#: ayatanawebmail/dialog.py:289
-msgid "Links"
-msgstr "Bağlantılar"
+#: /ayatanawebmail/dialog.py:280
+#, fuzzy
+msgid "Server:"
+msgstr "Sunucu bilgileri"
 
-#: ayatanawebmail/dialog.py:297
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr "Sunucu:"
 
-#: ayatanawebmail/dialog.py:299
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr "Port:"
 
-#: ayatanawebmail/dialog.py:302
-msgid "Login:"
-msgstr "Kullanıcı:"
+#: /ayatanawebmail/dialog.py:286
+msgid "Username:"
+msgstr ""
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr "Parola:"
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr "Klasörler:"
 
-#: ayatanawebmail/dialog.py:309
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr "Ev:"
 
-#: ayatanawebmail/dialog.py:311
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr "Yaz:"
 
-#: ayatanawebmail/dialog.py:313
+#: /ayatanawebmail/dialog.py:296
+msgid "Sent:"
+msgstr "Gönderilen:"
+
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr "Gelen kutusu:"
 
-#: ayatanawebmail/dialog.py:316
-msgid "Sent:"
-msgstr "Gönderilen:"
+#: /ayatanawebmail/dialog.py:300
+#, fuzzy
+msgid "Message:"
+msgstr "Mesaj eylemleri"
 
-#: ayatanawebmail/dialog.py:354
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr "Mesajı okundu olarak işaretle"
 
-#: ayatanawebmail/dialog.py:355
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr "Mesajı tarayıcıda aç/Komutu çalıştır"
 
-#: ayatanawebmail/dialog.py:356
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr "Ne yapılacağını bana sor"
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr "Bildirimleri etkinleştir:"
 
-#: ayatanawebmail/dialog.py:368
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr "Bir mesaj alındığında ses çal:"
 
-#: ayatanawebmail/dialog.py:370
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr "Aynı görüşmedeki mesajları birleştir:"
 
-#: ayatanawebmail/dialog.py:372
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr "Sıfır olduğunda sayıyı gizle:"
 
-#: ayatanawebmail/dialog.py:374
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr "Bir mesaj etkinleştirildiğinde:"
 
-#: ayatanawebmail/dialog.py:377
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr "Bir mesaj alındığında bu komutu çalıştır:"
 
-#: ayatanawebmail/dialog.py:384
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr "Çalınacak özel ses:"
 
-#: ayatanawebmail/dialog.py:400
-msgid "Report a bug/Request a feature"
+#: /ayatanawebmail/dialog.py:382
+msgid "Report a bug"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:384
+#, fuzzy
+msgid "Request a feature"
 msgstr "Hata bildir/Özellik iste"
 
-#: ayatanawebmail/dialog.py:402
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
+#, python-brace-format
+msgid "It's a good idea to add the {labelname} label to your issue."
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:387
 msgid "Ask a question"
 msgstr "Bir soru sor"
 
-#: ayatanawebmail/dialog.py:404
+#: /ayatanawebmail/dialog.py:390
 msgid "Help translate"
 msgstr "Çeviriye yardım et"
 
-#: ayatanawebmail/dialog.py:406
-msgid "Project page"
-msgstr "Proje sayfası"
-
-#: ayatanawebmail/dialog.py:408
+#: /ayatanawebmail/dialog.py:392
 msgid "Source code"
 msgstr "Kaynak kodları"
 
-#: ayatanawebmail/dialog.py:410
-msgid "Repository"
-msgstr "Depo"
-
-#: ayatanawebmail/dialog.py:412
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr "Ana sayfa"
 
-#: ayatanawebmail/dialog.py:426
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr "Oğuz Ersen"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
-msgstr "Ayatana Webmail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+#, fuzzy
+msgid "Enable notifications"
+msgstr "Bildirimleri etkinleştir:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+#, fuzzy
+msgid "Play sound when new messages arrive."
+msgstr "Bir mesaj alındığında ses çal:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+#, fuzzy
+msgid "Hide message count"
+msgstr "Mesajı aç /Komutu çalıştır"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+#, fuzzy
+msgid "Run this command when new messages arrive."
+msgstr "Bir mesaj alındığında bu komutu çalıştır:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+#, fuzzy
+msgid "Custom sound"
+msgstr "Çalınacak özel ses:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+#, fuzzy
+msgid "Play a custom sound when new messages arrive."
+msgstr "Bir mesaj alındığında ses çal:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+#, fuzzy
+msgid "Merge messages"
+msgstr "Mesajı okundu olarak işaretle"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+#, fuzzy
+msgid "Merge messages belonging to the same conversation."
+msgstr "Aynı görüşmedeki mesajları birleştir:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+#, fuzzy
+msgid "Message action"
+msgstr "Mesaj eylemleri"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+#, fuzzy
+msgid "Action to perform when a message is activated."
+msgstr "Bir mesaj etkinleştirildiğinde:"
+
+#, python-brace-format
+#~ msgid "You can run \"{command}\" to delete all your login settings."
+#~ msgstr ""
+#~ "Tüm oturum açma ayarlarınızı silmek için \"{command}\" komutunu "
+#~ "çalıştırabilirsiniz."
+
+#~ msgid "Web page"
+#~ msgstr "Web sayfası"
+
+#~ msgid "Command"
+#~ msgstr "Komut"
+
+#~ msgid ""
+#~ "Please visit the following link and enable access for less secure apps:"
+#~ msgstr ""
+#~ "Lütfen aşağıdaki bağlantıyı ziyaret edin ve daha az güvenli uygulamalar "
+#~ "için erişimi etkinleştirin:"
+
+#~ msgid "Access blocked by Google"
+#~ msgstr "Erişim Google tarafından engellendi"
+
+#~ msgid "Choose an account"
+#~ msgstr "Bir hesap seçiniz"
+
+#~ msgid "Account data"
+#~ msgstr "Hesap bilgileri"
+
+#~ msgid "Links"
+#~ msgstr "Bağlantılar"
+
+#~ msgid "Login:"
+#~ msgstr "Kullanıcı:"
+
+#~ msgid "Project page"
+#~ msgstr "Proje sayfası"
+
+#~ msgid "Repository"
+#~ msgstr "Depo"
+
+#~ msgid "Ayatana Webmail"
+#~ msgstr "Ayatana Webmail"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:39
-msgid "Webmail notifications and actions for any desktop"
-msgstr "Herhangi bir masaüstü için web e-posta bildirimleri ve eylemleri"
+#~ msgid "Webmail notifications and actions for any desktop"
+#~ msgstr "Herhangi bir masaüstü için web e-posta bildirimleri ve eylemleri"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:74
-msgid "Mark all as read"
-msgstr "Tümünü okundu olarak işaretle"
+#~ msgid "Mark all as read"
+#~ msgstr "Tümünü okundu olarak işaretle"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:112
-msgid "Compose Mail"
-msgstr "E-posta Oluştur"
+#~ msgid "Compose Mail"
+#~ msgstr "E-posta Oluştur"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:152
-msgid "Sent"
-msgstr "Gönderilenler"
+#~ msgid "Sent"
+#~ msgstr "Gönderilenler"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:228
-msgid "Inbox"
-msgstr "Gelenler"
+#~ msgid "Inbox"
+#~ msgstr "Gelenler"
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
-msgstr "Ayatana Webmail (hizmet)"
+#~ msgid "Ayatana Webmail (service)"
+#~ msgstr "Ayatana Webmail (hizmet)"
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:38
-msgid "Display notifications about new mail"
-msgstr "Yeni e-posta bildirimlerini görüntüle"
+#~ msgid "Display notifications about new mail"
+#~ msgstr "Yeni e-posta bildirimlerini görüntüle"
diff --git a/po/tt.po b/po/tt.po
index 8fa72a6..d6ac97f 100644
--- a/po/tt.po
+++ b/po/tt.po
@@ -6,9 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail 22.6.28\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/"
-"issues\n"
-"POT-Creation-Date: 2020-08-22 20:15+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -18,299 +17,328 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr ""
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr ""
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr ""
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:204
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr ""
 
-#: ayatanawebmail/application.py:211
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr ""
 
-#: ayatanawebmail/application.py:218
-#: data/usr/share/applications/ayatana-webmail.desktop:35
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr ""
 
-#: ayatanawebmail/application.py:957
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:1110
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr ""
 
-#: ayatanawebmail/application.py:1111
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
-msgid "Unable to connect to account \"{accountName}\", the application will now exit."
+msgid ""
+"Unable to connect to account \"{accountName}\", the application will now "
+"exit."
 msgstr ""
 
-#: ayatanawebmail/application.py:1136
+#: /ayatanawebmail/application.py:1131
 #, python-format
-msgid "You have %d unread mail"
-msgid_plural "You have %d unread mails"
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
 msgstr[0] ""
 
-#: ayatanawebmail/application.py:1163
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr ""
 
-#: ayatanawebmail/application.py:1165
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1167
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1180
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:60
-msgid "If this string starts with http:// or https://, the application will open it in your browser - otherwise, it will be run as a command"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:61
+msgid ""
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:90 ayatanawebmail/dialog.py:104
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:132
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:140
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:141
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:142
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:143
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:204
-msgid "Please visit the following link and enable access for less secure apps:"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:206
-msgid "Access blocked by Google"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:210
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:211
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:234
-msgid "Custom"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:242
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:244
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:286
-msgid "The application will append this string to \"Inbox\" to access a specific message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+#: /ayatanawebmail/dialog.py:276
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:288
+#: /ayatanawebmail/dialog.py:278
 msgid "Account:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:290
+#: /ayatanawebmail/dialog.py:280
 msgid "Server:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:292
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:294
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:296
+#: /ayatanawebmail/dialog.py:286
 msgid "Username:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:298
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:300
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:302
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:296
 msgid "Sent:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:308
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:310
+#: /ayatanawebmail/dialog.py:300
 msgid "Message:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:346
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:347
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:348
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:358
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:360
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:362
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:364
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:369
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:376
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:392
+#: /ayatanawebmail/dialog.py:382
 msgid "Report a bug"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:394
+#: /ayatanawebmail/dialog.py:384
 msgid "Request a feature"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:396 ayatanawebmail/dialog.py:399
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
 #, python-brace-format
 msgid "It's a good idea to add the {labelname} label to your issue."
 msgstr ""
 
-#: ayatanawebmail/dialog.py:397
+#: /ayatanawebmail/dialog.py:387
 msgid "Ask a question"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:400
+#: /ayatanawebmail/dialog.py:390
 msgid "Help translate"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:402
+#: /ayatanawebmail/dialog.py:392
 msgid "Source code"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:404
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:424
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+msgid "Enable notifications"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+msgid "Play sound when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+msgid "Hide message count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:5
-msgid "Display notifications about new mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+msgid "Run this command when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+msgid "Custom sound"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:5
-msgid "Webmail notifications and actions for any desktop"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+msgid "Play a custom sound when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:15
-msgid "Mark all as read"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+msgid "Merge messages"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:20
-msgid "Compose Mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+msgid "Merge messages belonging to the same conversation."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:25
-msgid "Sent"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+msgid "Message action"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:30
-msgid "Inbox"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+msgid "Action to perform when a message is activated."
 msgstr ""
diff --git a/po/ug.po b/po/ug.po
index e7f4341..a45b122 100755
--- a/po/ug.po
+++ b/po/ug.po
@@ -6,11 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/issues\n"
-"POT-Creation-Date: 2020-04-03 12:21+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: 2018-06-04 07:34+0000\n"
 "Last-Translator: Eltikin <eltikinuyghur@hotmail.com>\n"
 "Language-Team: Uyghur <ug@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,314 +19,357 @@ msgstr ""
 "X-Launchpad-Export-Date: 2020-04-04 05:58+0000\n"
 "X-Generator: Launchpad (build a296f04231dee355be5db73cc878b9e21689a253)\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr ""
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr ""
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr ""
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:205
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr ""
 
-#: ayatanawebmail/application.py:212
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr ""
 
-#: ayatanawebmail/application.py:219
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr ""
 
-#: ayatanawebmail/application.py:980
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr "تېمىسىز"
 
-#: ayatanawebmail/application.py:1132
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr ""
 
-#: ayatanawebmail/application.py:1133
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
 msgid ""
 "Unable to connect to account \"{accountName}\", the application will now "
 "exit."
 msgstr ""
 
-#: ayatanawebmail/application.py:1133
-#, python-brace-format
-msgid "You can run \"{command}\" to delete all your login settings."
-msgstr ""
-
-#: ayatanawebmail/application.py:1158
+#: /ayatanawebmail/application.py:1131
 #, python-format
-msgid "You have %d unread mail"
-msgid_plural "You have %d unread mails"
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
 msgstr[0] ""
-msgstr[1] ""
 
-#: ayatanawebmail/application.py:1185
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr ""
 
-#: ayatanawebmail/application.py:1187
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1189
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1202
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:60
-msgid "Web page"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:61
-msgid "Command"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:93
+#: /ayatanawebmail/dialog.py:61
 msgid ""
-"Append an additional string - you can use the $MSG_THREAD and $MSG_UID "
-"placeholders."
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:114 ayatanawebmail/dialog.py:128
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:156
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:164
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr "ھېساباتلار"
 
-#: ayatanawebmail/dialog.py:165
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr "تاللانما"
 
-#: ayatanawebmail/dialog.py:166
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:167
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:228
-msgid ""
-"Please visit the following link and enable access for less secure apps:"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:230
-msgid "Access blocked by Google"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:234
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:235
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:254
-msgid "Choose an account"
-msgstr "ھېسابات تاللاش"
-
-#: ayatanawebmail/dialog.py:259
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:261
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:276
-msgid "Server data"
-msgstr "مۇلازىمىتىر ئۇچۇرى"
+#: /ayatanawebmail/dialog.py:276
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+msgstr ""
 
-#: ayatanawebmail/dialog.py:278
-msgid "Account data"
-msgstr "ھېساب سانلىق-مەلۇماتى"
+#: /ayatanawebmail/dialog.py:278
+#, fuzzy
+msgid "Account:"
+msgstr "ھېساباتلار"
 
-#: ayatanawebmail/dialog.py:289
-msgid "Links"
-msgstr ""
+#: /ayatanawebmail/dialog.py:280
+#, fuzzy
+msgid "Server:"
+msgstr "مۇلازىمىتىر ئۇچۇرى"
 
-#: ayatanawebmail/dialog.py:297
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr "باش ئاپپارات："
 
-#: ayatanawebmail/dialog.py:299
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr "ئېغىز:"
 
-#: ayatanawebmail/dialog.py:302
-msgid "Login:"
-msgstr "تىزىمغا كىر:"
+#: /ayatanawebmail/dialog.py:286
+msgid "Username:"
+msgstr ""
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr "پارول"
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:309
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr "باش بەت"
 
-#: ayatanawebmail/dialog.py:311
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr "تور مەكتۈپ يېزىش"
 
-#: ayatanawebmail/dialog.py:313
+#: /ayatanawebmail/dialog.py:296
+msgid "Sent:"
+msgstr "ئەۋەتىلگەن:"
+
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr "خەت ساندۇقى"
 
-#: ayatanawebmail/dialog.py:316
-msgid "Sent:"
-msgstr "ئەۋەتىلگەن:"
+#: /ayatanawebmail/dialog.py:300
+msgid "Message:"
+msgstr ""
 
-#: ayatanawebmail/dialog.py:354
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:355
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:356
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr "ئۇقتۇرۇشنى قوزغىتش"
 
-#: ayatanawebmail/dialog.py:368
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:370
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:372
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:374
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:377
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:384
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:400
-msgid "Report a bug/Request a feature"
+#: /ayatanawebmail/dialog.py:382
+msgid "Report a bug"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:402
-msgid "Ask a question"
+#: /ayatanawebmail/dialog.py:384
+msgid "Request a feature"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:404
-msgid "Help translate"
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
+#, python-brace-format
+msgid "It's a good idea to add the {labelname} label to your issue."
 msgstr ""
 
-#: ayatanawebmail/dialog.py:406
-msgid "Project page"
+#: /ayatanawebmail/dialog.py:387
+msgid "Ask a question"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:408
-msgid "Source code"
+#: /ayatanawebmail/dialog.py:390
+msgid "Help translate"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:410
-msgid "Repository"
+#: /ayatanawebmail/dialog.py:392
+msgid "Source code"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:412
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:426
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Eltikin https://launchpad.net/~eltikinuyghur"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
-msgstr "Ayatana Webmail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+#, fuzzy
+msgid "Enable notifications"
+msgstr "ئۇقتۇرۇشنى قوزغىتش"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+msgid "Play sound when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+msgid "Hide message count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+msgid "Run this command when new messages arrive."
+msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:39
-msgid "Webmail notifications and actions for any desktop"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+msgid "Custom sound"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:74
-msgid "Mark all as read"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+msgid "Play a custom sound when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:112
-msgid "Compose Mail"
-msgstr "Compose Mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+msgid "Merge messages"
+msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:152
-msgid "Sent"
-msgstr "ئەۋەتكەنلىرى"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+msgid "Merge messages belonging to the same conversation."
+msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:228
-msgid "Inbox"
-msgstr "خەتدان"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+msgid "Message action"
+msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+msgid "Action to perform when a message is activated."
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:38
-msgid "Display notifications about new mail"
-msgstr "يېڭى تور مەكتۇپلارنى كۆرسېتش"
+#~ msgid "Choose an account"
+#~ msgstr "ھېسابات تاللاش"
+
+#~ msgid "Account data"
+#~ msgstr "ھېساب سانلىق-مەلۇماتى"
+
+#~ msgid "Login:"
+#~ msgstr "تىزىمغا كىر:"
+
+#~ msgid "Ayatana Webmail"
+#~ msgstr "Ayatana Webmail"
+
+#~ msgid "Compose Mail"
+#~ msgstr "Compose Mail"
+
+#~ msgid "Sent"
+#~ msgstr "ئەۋەتكەنلىرى"
+
+#~ msgid "Inbox"
+#~ msgstr "خەتدان"
+
+#~ msgid "Display notifications about new mail"
+#~ msgstr "يېڭى تور مەكتۇپلارنى كۆرسېتش"
diff --git a/po/uk.po b/po/uk.po
index c05d364..d100c68 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -6,13 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/"
-"issues\n"
-"POT-Creation-Date: 2020-04-03 12:21+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: 2022-04-23 12:18+0000\n"
 "Last-Translator: Sergii Horichenko <m@sgg.im>\n"
-"Language-Team: Ukrainian <https://hosted.weblate.org/projects/"
-"ayatana-indicators/ayatana-webmail/uk/>\n"
+"Language-Team: Ukrainian <https://hosted.weblate.org/projects/ayatana-"
+"indicators/ayatana-webmail/uk/>\n"
 "Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,59 +21,59 @@ msgstr ""
 "X-Generator: Weblate 4.12.1-dev\n"
 "X-Launchpad-Export-Date: 2020-04-04 05:58+0000\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr "Оберіть обліковий запис"
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr "Яку команду/веб-сторінку облікового запису ви би хотіли відкрити?"
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr "Дії з повідомленнями"
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr "Видалити"
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr "Позначити як прочитане"
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr "Відкрити повідомлення/Виконати команду"
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr "Відправник"
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr "Тема"
 
-#: ayatanawebmail/application.py:205
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr "Відкрити пошту в оглядачі"
 
-#: ayatanawebmail/application.py:212
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr "Очистити"
 
-#: ayatanawebmail/application.py:219
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr "Налаштування"
 
-#: ayatanawebmail/application.py:980
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr "Без теми"
 
-#: ayatanawebmail/application.py:1132
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr "Помилка з'єднання"
 
-#: ayatanawebmail/application.py:1133
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
 msgid ""
 "Unable to connect to account \"{accountName}\", the application will now "
@@ -83,260 +82,351 @@ msgstr ""
 "Неможливо з'єднатись із обліковим записом \"{accountName}\", програма зараз "
 "закриється."
 
-#: ayatanawebmail/application.py:1133
-#, python-brace-format
-msgid "You can run \"{command}\" to delete all your login settings."
-msgstr ""
-"Ви можете запустити \"{command}\" для знищення усіх ваших налаштувань входу."
-
-#: ayatanawebmail/application.py:1158
-#, python-format
-msgid "You have %d unread mail"
-msgid_plural "You have %d unread mails"
+#: /ayatanawebmail/application.py:1131
+#, fuzzy, python-format
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
 msgstr[0] "У вас %d непрочитаний лист"
 msgstr[1] "У вас %d непрочитаних листи"
 msgstr[2] "У вас %d непрочитаних листів"
 
-#: ayatanawebmail/application.py:1185
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr "Від %(t0)s, %(t1)s та інших"
 
-#: ayatanawebmail/application.py:1187
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr "Від %(t0)s та %(t1)s"
 
-#: ayatanawebmail/application.py:1189
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr "від %s"
 
-#: ayatanawebmail/application.py:1202
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr "Нове повідомлення від %s"
 
-#: ayatanawebmail/dialog.py:60
-msgid "Web page"
-msgstr "Веб-сторінка"
-
-#: ayatanawebmail/dialog.py:61
-msgid "Command"
-msgstr "Команда"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
+msgstr ""
 
-#: ayatanawebmail/dialog.py:93
+#: /ayatanawebmail/dialog.py:61
 msgid ""
-"Append an additional string - you can use the $MSG_THREAD and $MSG_UID "
-"placeholders."
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:114 ayatanawebmail/dialog.py:128
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr "(Відсутнє)"
 
-#: ayatanawebmail/dialog.py:156
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr "Налаштування Ayatana Webmail"
 
-#: ayatanawebmail/dialog.py:164
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr "Облікові записи"
 
-#: ayatanawebmail/dialog.py:165
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr "Параметри"
 
-#: ayatanawebmail/dialog.py:166
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr "Підтримка"
 
-#: ayatanawebmail/dialog.py:167
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr "Про програму"
 
-#: ayatanawebmail/dialog.py:228
-msgid ""
-"Please visit the following link and enable access for less secure apps:"
-msgstr ""
-"Будь ласка, відвідайте наступне посилання та надайте доступ для менш "
-"безпечних додатків:"
-
-#: ayatanawebmail/dialog.py:230
-msgid "Access blocked by Google"
-msgstr "Доступ заблокований Google"
-
-#: ayatanawebmail/dialog.py:234
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr ""
 "Не вдалось підключитися до поштового облікового запису. Повернено помилку:"
 
-#: ayatanawebmail/dialog.py:235
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr "Невдале з'єднання"
 
-#: ayatanawebmail/dialog.py:254
-msgid "Choose an account"
-msgstr "Виберіть обліковий запис"
-
-#: ayatanawebmail/dialog.py:259
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr "Додати"
 
-#: ayatanawebmail/dialog.py:261
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr "Видалити"
 
-#: ayatanawebmail/dialog.py:276
-msgid "Server data"
-msgstr "Дані серверу"
+#: /ayatanawebmail/dialog.py:276
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+msgstr ""
 
-#: ayatanawebmail/dialog.py:278
-msgid "Account data"
-msgstr "Дані облікового запису"
+#: /ayatanawebmail/dialog.py:278
+#, fuzzy
+msgid "Account:"
+msgstr "Облікові записи"
 
-#: ayatanawebmail/dialog.py:289
-msgid "Links"
-msgstr "Посилання"
+#: /ayatanawebmail/dialog.py:280
+#, fuzzy
+msgid "Server:"
+msgstr "Дані серверу"
 
-#: ayatanawebmail/dialog.py:297
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr "Хост:"
 
-#: ayatanawebmail/dialog.py:299
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr "Порт:"
 
-#: ayatanawebmail/dialog.py:302
-msgid "Login:"
-msgstr "Логін:"
+#: /ayatanawebmail/dialog.py:286
+msgid "Username:"
+msgstr ""
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr "Пароль:"
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr "Теки:"
 
-#: ayatanawebmail/dialog.py:309
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr "Головна сторінка:"
 
-#: ayatanawebmail/dialog.py:311
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr "Написати:"
 
-#: ayatanawebmail/dialog.py:313
+#: /ayatanawebmail/dialog.py:296
+msgid "Sent:"
+msgstr "Надіслані:"
+
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr "Вхідні:"
 
-#: ayatanawebmail/dialog.py:316
-msgid "Sent:"
-msgstr "Надіслані:"
+#: /ayatanawebmail/dialog.py:300
+#, fuzzy
+msgid "Message:"
+msgstr "Дії з повідомленнями"
 
-#: ayatanawebmail/dialog.py:354
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr "Позначити повідомлення як прочитане"
 
-#: ayatanawebmail/dialog.py:355
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr "Відкрити повідомлення в оглядачі/Виконати команду"
 
-#: ayatanawebmail/dialog.py:356
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr "Запитати мене, що робити"
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr "Увімкнути сповіщення:"
 
-#: ayatanawebmail/dialog.py:368
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr "При отримання повідомлення відтворювати звук:"
 
-#: ayatanawebmail/dialog.py:370
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr "Об'єднувати повідомлення тієї самої розмови:"
 
-#: ayatanawebmail/dialog.py:372
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr "Приховати кількість, якщо нуль:"
 
-#: ayatanawebmail/dialog.py:374
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr "Коли повідомлення активне:"
 
-#: ayatanawebmail/dialog.py:377
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr "При отриманні повідомлення виконати цю команду:"
 
-#: ayatanawebmail/dialog.py:384
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr "Вибрати звук сповіщення:"
 
-#: ayatanawebmail/dialog.py:400
-msgid "Report a bug/Request a feature"
+#: /ayatanawebmail/dialog.py:382
+msgid "Report a bug"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:384
+#, fuzzy
+msgid "Request a feature"
 msgstr "Повідомити про помилку/Запит про довідку"
 
-#: ayatanawebmail/dialog.py:402
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
+#, python-brace-format
+msgid "It's a good idea to add the {labelname} label to your issue."
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:387
 msgid "Ask a question"
 msgstr "Запитати"
 
-#: ayatanawebmail/dialog.py:404
+#: /ayatanawebmail/dialog.py:390
 msgid "Help translate"
 msgstr "Допомогти з перекладом"
 
-#: ayatanawebmail/dialog.py:406
-msgid "Project page"
-msgstr "Сторінка проекту"
-
-#: ayatanawebmail/dialog.py:408
+#: /ayatanawebmail/dialog.py:392
 msgid "Source code"
 msgstr "Джерельний код"
 
-#: ayatanawebmail/dialog.py:410
-msgid "Repository"
-msgstr "Репозиторій"
-
-#: ayatanawebmail/dialog.py:412
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr "Домашня сторінка"
 
-#: ayatanawebmail/dialog.py:426
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Vitalii Paslavskyi https://launchpad.net/~vpaslavskyi"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
-msgstr "Ayatana Webmail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+#, fuzzy
+msgid "Enable notifications"
+msgstr "Увімкнути сповіщення:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+#, fuzzy
+msgid "Play sound when new messages arrive."
+msgstr "При отримання повідомлення відтворювати звук:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+#, fuzzy
+msgid "Hide message count"
+msgstr "Відкрити повідомлення/Виконати команду"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+#, fuzzy
+msgid "Run this command when new messages arrive."
+msgstr "При отриманні повідомлення виконати цю команду:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+#, fuzzy
+msgid "Custom sound"
+msgstr "Вибрати звук сповіщення:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+#, fuzzy
+msgid "Play a custom sound when new messages arrive."
+msgstr "При отримання повідомлення відтворювати звук:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+#, fuzzy
+msgid "Merge messages"
+msgstr "Позначити повідомлення як прочитане"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+#, fuzzy
+msgid "Merge messages belonging to the same conversation."
+msgstr "Об'єднувати повідомлення тієї самої розмови:"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+#, fuzzy
+msgid "Message action"
+msgstr "Дії з повідомленнями"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+#, fuzzy
+msgid "Action to perform when a message is activated."
+msgstr "Коли повідомлення активне:"
+
+#, python-brace-format
+#~ msgid "You can run \"{command}\" to delete all your login settings."
+#~ msgstr ""
+#~ "Ви можете запустити \"{command}\" для знищення усіх ваших налаштувань "
+#~ "входу."
+
+#~ msgid "Web page"
+#~ msgstr "Веб-сторінка"
+
+#~ msgid "Command"
+#~ msgstr "Команда"
+
+#~ msgid ""
+#~ "Please visit the following link and enable access for less secure apps:"
+#~ msgstr ""
+#~ "Будь ласка, відвідайте наступне посилання та надайте доступ для менш "
+#~ "безпечних додатків:"
+
+#~ msgid "Access blocked by Google"
+#~ msgstr "Доступ заблокований Google"
+
+#~ msgid "Choose an account"
+#~ msgstr "Виберіть обліковий запис"
+
+#~ msgid "Account data"
+#~ msgstr "Дані облікового запису"
+
+#~ msgid "Links"
+#~ msgstr "Посилання"
+
+#~ msgid "Login:"
+#~ msgstr "Логін:"
+
+#~ msgid "Project page"
+#~ msgstr "Сторінка проекту"
+
+#~ msgid "Repository"
+#~ msgstr "Репозиторій"
+
+#~ msgid "Ayatana Webmail"
+#~ msgstr "Ayatana Webmail"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:39
-msgid "Webmail notifications and actions for any desktop"
-msgstr "Сповіщення та дії веб-пошти для будь-якого робочого столу"
+#~ msgid "Webmail notifications and actions for any desktop"
+#~ msgstr "Сповіщення та дії веб-пошти для будь-якого робочого столу"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:74
-msgid "Mark all as read"
-msgstr "Позначити всі як прочитані"
+#~ msgid "Mark all as read"
+#~ msgstr "Позначити всі як прочитані"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:112
-msgid "Compose Mail"
-msgstr "Написати листа"
+#~ msgid "Compose Mail"
+#~ msgstr "Написати листа"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:152
-msgid "Sent"
-msgstr "Надіслані"
+#~ msgid "Sent"
+#~ msgstr "Надіслані"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:228
-msgid "Inbox"
-msgstr "Вхідні"
+#~ msgid "Inbox"
+#~ msgstr "Вхідні"
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
-msgstr "Ayatana Webmail (служба)"
+#~ msgid "Ayatana Webmail (service)"
+#~ msgstr "Ayatana Webmail (служба)"
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:38
-msgid "Display notifications about new mail"
-msgstr "Показувати повідомлення про новий лист"
+#~ msgid "Display notifications about new mail"
+#~ msgstr "Показувати повідомлення про новий лист"
diff --git a/po/ur.po b/po/ur.po
index bc34a99..3b151e4 100644
--- a/po/ur.po
+++ b/po/ur.po
@@ -6,9 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail 22.6.28\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/"
-"issues\n"
-"POT-Creation-Date: 2020-08-22 20:15+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -18,300 +17,329 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr ""
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr ""
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr ""
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:204
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr ""
 
-#: ayatanawebmail/application.py:211
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr ""
 
-#: ayatanawebmail/application.py:218
-#: data/usr/share/applications/ayatana-webmail.desktop:35
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr ""
 
-#: ayatanawebmail/application.py:957
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:1110
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr ""
 
-#: ayatanawebmail/application.py:1111
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
-msgid "Unable to connect to account \"{accountName}\", the application will now exit."
+msgid ""
+"Unable to connect to account \"{accountName}\", the application will now "
+"exit."
 msgstr ""
 
-#: ayatanawebmail/application.py:1136
+#: /ayatanawebmail/application.py:1131
 #, python-format
-msgid "You have %d unread mail"
-msgid_plural "You have %d unread mails"
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ayatanawebmail/application.py:1163
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr ""
 
-#: ayatanawebmail/application.py:1165
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1167
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1180
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:60
-msgid "If this string starts with http:// or https://, the application will open it in your browser - otherwise, it will be run as a command"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:61
+msgid ""
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:90 ayatanawebmail/dialog.py:104
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:132
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:140
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:141
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:142
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:143
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:204
-msgid "Please visit the following link and enable access for less secure apps:"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:206
-msgid "Access blocked by Google"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:210
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:211
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:234
-msgid "Custom"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:242
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:244
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:286
-msgid "The application will append this string to \"Inbox\" to access a specific message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+#: /ayatanawebmail/dialog.py:276
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:288
+#: /ayatanawebmail/dialog.py:278
 msgid "Account:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:290
+#: /ayatanawebmail/dialog.py:280
 msgid "Server:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:292
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:294
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:296
+#: /ayatanawebmail/dialog.py:286
 msgid "Username:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:298
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:300
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:302
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:296
 msgid "Sent:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:308
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:310
+#: /ayatanawebmail/dialog.py:300
 msgid "Message:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:346
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:347
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:348
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:358
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:360
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:362
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:364
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:369
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:376
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:392
+#: /ayatanawebmail/dialog.py:382
 msgid "Report a bug"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:394
+#: /ayatanawebmail/dialog.py:384
 msgid "Request a feature"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:396 ayatanawebmail/dialog.py:399
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
 #, python-brace-format
 msgid "It's a good idea to add the {labelname} label to your issue."
 msgstr ""
 
-#: ayatanawebmail/dialog.py:397
+#: /ayatanawebmail/dialog.py:387
 msgid "Ask a question"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:400
+#: /ayatanawebmail/dialog.py:390
 msgid "Help translate"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:402
+#: /ayatanawebmail/dialog.py:392
 msgid "Source code"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:404
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:424
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+msgid "Enable notifications"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+msgid "Play sound when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+msgid "Hide message count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:5
-msgid "Display notifications about new mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+msgid "Run this command when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+msgid "Custom sound"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:5
-msgid "Webmail notifications and actions for any desktop"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+msgid "Play a custom sound when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:15
-msgid "Mark all as read"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+msgid "Merge messages"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:20
-msgid "Compose Mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+msgid "Merge messages belonging to the same conversation."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:25
-msgid "Sent"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+msgid "Message action"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:30
-msgid "Inbox"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+msgid "Action to perform when a message is activated."
 msgstr ""
diff --git a/po/uz.po b/po/uz.po
index 639b8f7..2e5ed3f 100644
--- a/po/uz.po
+++ b/po/uz.po
@@ -6,9 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail 22.6.28\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/"
-"issues\n"
-"POT-Creation-Date: 2020-08-22 20:15+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -18,300 +17,329 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr ""
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr ""
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr ""
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:204
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr ""
 
-#: ayatanawebmail/application.py:211
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr ""
 
-#: ayatanawebmail/application.py:218
-#: data/usr/share/applications/ayatana-webmail.desktop:35
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr ""
 
-#: ayatanawebmail/application.py:957
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:1110
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr ""
 
-#: ayatanawebmail/application.py:1111
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
-msgid "Unable to connect to account \"{accountName}\", the application will now exit."
+msgid ""
+"Unable to connect to account \"{accountName}\", the application will now "
+"exit."
 msgstr ""
 
-#: ayatanawebmail/application.py:1136
+#: /ayatanawebmail/application.py:1131
 #, python-format
-msgid "You have %d unread mail"
-msgid_plural "You have %d unread mails"
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ayatanawebmail/application.py:1163
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr ""
 
-#: ayatanawebmail/application.py:1165
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1167
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1180
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:60
-msgid "If this string starts with http:// or https://, the application will open it in your browser - otherwise, it will be run as a command"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:61
+msgid ""
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:90 ayatanawebmail/dialog.py:104
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:132
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:140
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:141
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:142
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:143
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:204
-msgid "Please visit the following link and enable access for less secure apps:"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:206
-msgid "Access blocked by Google"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:210
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:211
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:234
-msgid "Custom"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:242
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:244
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:286
-msgid "The application will append this string to \"Inbox\" to access a specific message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+#: /ayatanawebmail/dialog.py:276
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:288
+#: /ayatanawebmail/dialog.py:278
 msgid "Account:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:290
+#: /ayatanawebmail/dialog.py:280
 msgid "Server:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:292
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:294
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:296
+#: /ayatanawebmail/dialog.py:286
 msgid "Username:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:298
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:300
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:302
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:296
 msgid "Sent:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:308
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:310
+#: /ayatanawebmail/dialog.py:300
 msgid "Message:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:346
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:347
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:348
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:358
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:360
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:362
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:364
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:369
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:376
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:392
+#: /ayatanawebmail/dialog.py:382
 msgid "Report a bug"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:394
+#: /ayatanawebmail/dialog.py:384
 msgid "Request a feature"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:396 ayatanawebmail/dialog.py:399
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
 #, python-brace-format
 msgid "It's a good idea to add the {labelname} label to your issue."
 msgstr ""
 
-#: ayatanawebmail/dialog.py:397
+#: /ayatanawebmail/dialog.py:387
 msgid "Ask a question"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:400
+#: /ayatanawebmail/dialog.py:390
 msgid "Help translate"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:402
+#: /ayatanawebmail/dialog.py:392
 msgid "Source code"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:404
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:424
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+msgid "Enable notifications"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+msgid "Play sound when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+msgid "Hide message count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:5
-msgid "Display notifications about new mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+msgid "Run this command when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+msgid "Custom sound"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:5
-msgid "Webmail notifications and actions for any desktop"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+msgid "Play a custom sound when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:15
-msgid "Mark all as read"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+msgid "Merge messages"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:20
-msgid "Compose Mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+msgid "Merge messages belonging to the same conversation."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:25
-msgid "Sent"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+msgid "Message action"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:30
-msgid "Inbox"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+msgid "Action to perform when a message is activated."
 msgstr ""
diff --git a/po/vec.po b/po/vec.po
index ee14bc4..bd720f1 100644
--- a/po/vec.po
+++ b/po/vec.po
@@ -6,9 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail 22.6.28\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/"
-"issues\n"
-"POT-Creation-Date: 2020-08-22 20:15+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -18,300 +17,329 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr ""
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr ""
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr ""
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:204
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr ""
 
-#: ayatanawebmail/application.py:211
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr ""
 
-#: ayatanawebmail/application.py:218
-#: data/usr/share/applications/ayatana-webmail.desktop:35
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr ""
 
-#: ayatanawebmail/application.py:957
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:1110
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr ""
 
-#: ayatanawebmail/application.py:1111
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
-msgid "Unable to connect to account \"{accountName}\", the application will now exit."
+msgid ""
+"Unable to connect to account \"{accountName}\", the application will now "
+"exit."
 msgstr ""
 
-#: ayatanawebmail/application.py:1136
+#: /ayatanawebmail/application.py:1131
 #, python-format
-msgid "You have %d unread mail"
-msgid_plural "You have %d unread mails"
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ayatanawebmail/application.py:1163
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr ""
 
-#: ayatanawebmail/application.py:1165
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1167
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1180
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:60
-msgid "If this string starts with http:// or https://, the application will open it in your browser - otherwise, it will be run as a command"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:61
+msgid ""
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:90 ayatanawebmail/dialog.py:104
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:132
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:140
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:141
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:142
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:143
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:204
-msgid "Please visit the following link and enable access for less secure apps:"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:206
-msgid "Access blocked by Google"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:210
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:211
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:234
-msgid "Custom"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:242
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:244
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:286
-msgid "The application will append this string to \"Inbox\" to access a specific message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+#: /ayatanawebmail/dialog.py:276
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:288
+#: /ayatanawebmail/dialog.py:278
 msgid "Account:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:290
+#: /ayatanawebmail/dialog.py:280
 msgid "Server:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:292
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:294
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:296
+#: /ayatanawebmail/dialog.py:286
 msgid "Username:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:298
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:300
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:302
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:296
 msgid "Sent:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:308
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:310
+#: /ayatanawebmail/dialog.py:300
 msgid "Message:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:346
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:347
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:348
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:358
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:360
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:362
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:364
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:369
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:376
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:392
+#: /ayatanawebmail/dialog.py:382
 msgid "Report a bug"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:394
+#: /ayatanawebmail/dialog.py:384
 msgid "Request a feature"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:396 ayatanawebmail/dialog.py:399
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
 #, python-brace-format
 msgid "It's a good idea to add the {labelname} label to your issue."
 msgstr ""
 
-#: ayatanawebmail/dialog.py:397
+#: /ayatanawebmail/dialog.py:387
 msgid "Ask a question"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:400
+#: /ayatanawebmail/dialog.py:390
 msgid "Help translate"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:402
+#: /ayatanawebmail/dialog.py:392
 msgid "Source code"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:404
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:424
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+msgid "Enable notifications"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+msgid "Play sound when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+msgid "Hide message count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:5
-msgid "Display notifications about new mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+msgid "Run this command when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+msgid "Custom sound"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:5
-msgid "Webmail notifications and actions for any desktop"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+msgid "Play a custom sound when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:15
-msgid "Mark all as read"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+msgid "Merge messages"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:20
-msgid "Compose Mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+msgid "Merge messages belonging to the same conversation."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:25
-msgid "Sent"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+msgid "Message action"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:30
-msgid "Inbox"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+msgid "Action to perform when a message is activated."
 msgstr ""
diff --git a/po/vi.po b/po/vi.po
index a5c4394..78116fd 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -6,9 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail 22.6.28\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/"
-"issues\n"
-"POT-Creation-Date: 2020-08-22 20:15+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -18,299 +17,328 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr ""
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr ""
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr ""
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:204
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr ""
 
-#: ayatanawebmail/application.py:211
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr ""
 
-#: ayatanawebmail/application.py:218
-#: data/usr/share/applications/ayatana-webmail.desktop:35
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr ""
 
-#: ayatanawebmail/application.py:957
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:1110
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr ""
 
-#: ayatanawebmail/application.py:1111
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
-msgid "Unable to connect to account \"{accountName}\", the application will now exit."
+msgid ""
+"Unable to connect to account \"{accountName}\", the application will now "
+"exit."
 msgstr ""
 
-#: ayatanawebmail/application.py:1136
+#: /ayatanawebmail/application.py:1131
 #, python-format
-msgid "You have %d unread mail"
-msgid_plural "You have %d unread mails"
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
 msgstr[0] ""
 
-#: ayatanawebmail/application.py:1163
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr ""
 
-#: ayatanawebmail/application.py:1165
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1167
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1180
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:60
-msgid "If this string starts with http:// or https://, the application will open it in your browser - otherwise, it will be run as a command"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:61
+msgid ""
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:90 ayatanawebmail/dialog.py:104
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:132
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:140
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:141
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:142
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:143
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:204
-msgid "Please visit the following link and enable access for less secure apps:"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:206
-msgid "Access blocked by Google"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:210
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:211
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:234
-msgid "Custom"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:242
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:244
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:286
-msgid "The application will append this string to \"Inbox\" to access a specific message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+#: /ayatanawebmail/dialog.py:276
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:288
+#: /ayatanawebmail/dialog.py:278
 msgid "Account:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:290
+#: /ayatanawebmail/dialog.py:280
 msgid "Server:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:292
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:294
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:296
+#: /ayatanawebmail/dialog.py:286
 msgid "Username:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:298
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:300
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:302
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:296
 msgid "Sent:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:308
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:310
+#: /ayatanawebmail/dialog.py:300
 msgid "Message:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:346
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:347
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:348
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:358
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:360
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:362
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:364
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:369
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:376
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:392
+#: /ayatanawebmail/dialog.py:382
 msgid "Report a bug"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:394
+#: /ayatanawebmail/dialog.py:384
 msgid "Request a feature"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:396 ayatanawebmail/dialog.py:399
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
 #, python-brace-format
 msgid "It's a good idea to add the {labelname} label to your issue."
 msgstr ""
 
-#: ayatanawebmail/dialog.py:397
+#: /ayatanawebmail/dialog.py:387
 msgid "Ask a question"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:400
+#: /ayatanawebmail/dialog.py:390
 msgid "Help translate"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:402
+#: /ayatanawebmail/dialog.py:392
 msgid "Source code"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:404
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:424
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+msgid "Enable notifications"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+msgid "Play sound when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+msgid "Hide message count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:5
-msgid "Display notifications about new mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+msgid "Run this command when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+msgid "Custom sound"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:5
-msgid "Webmail notifications and actions for any desktop"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+msgid "Play a custom sound when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:15
-msgid "Mark all as read"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+msgid "Merge messages"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:20
-msgid "Compose Mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+msgid "Merge messages belonging to the same conversation."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:25
-msgid "Sent"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+msgid "Message action"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:30
-msgid "Inbox"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+msgid "Action to perform when a message is activated."
 msgstr ""
diff --git a/po/wae.po b/po/wae.po
index acdc867..22c6735 100644
--- a/po/wae.po
+++ b/po/wae.po
@@ -6,9 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail 22.6.28\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/"
-"issues\n"
-"POT-Creation-Date: 2020-08-22 20:15+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -18,300 +17,329 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr ""
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr ""
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr ""
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:204
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr ""
 
-#: ayatanawebmail/application.py:211
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr ""
 
-#: ayatanawebmail/application.py:218
-#: data/usr/share/applications/ayatana-webmail.desktop:35
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr ""
 
-#: ayatanawebmail/application.py:957
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:1110
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr ""
 
-#: ayatanawebmail/application.py:1111
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
-msgid "Unable to connect to account \"{accountName}\", the application will now exit."
+msgid ""
+"Unable to connect to account \"{accountName}\", the application will now "
+"exit."
 msgstr ""
 
-#: ayatanawebmail/application.py:1136
+#: /ayatanawebmail/application.py:1131
 #, python-format
-msgid "You have %d unread mail"
-msgid_plural "You have %d unread mails"
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ayatanawebmail/application.py:1163
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr ""
 
-#: ayatanawebmail/application.py:1165
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1167
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1180
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:60
-msgid "If this string starts with http:// or https://, the application will open it in your browser - otherwise, it will be run as a command"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:61
+msgid ""
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:90 ayatanawebmail/dialog.py:104
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:132
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:140
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:141
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:142
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:143
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:204
-msgid "Please visit the following link and enable access for less secure apps:"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:206
-msgid "Access blocked by Google"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:210
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:211
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:234
-msgid "Custom"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:242
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:244
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:286
-msgid "The application will append this string to \"Inbox\" to access a specific message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+#: /ayatanawebmail/dialog.py:276
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:288
+#: /ayatanawebmail/dialog.py:278
 msgid "Account:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:290
+#: /ayatanawebmail/dialog.py:280
 msgid "Server:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:292
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:294
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:296
+#: /ayatanawebmail/dialog.py:286
 msgid "Username:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:298
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:300
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:302
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:296
 msgid "Sent:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:308
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:310
+#: /ayatanawebmail/dialog.py:300
 msgid "Message:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:346
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:347
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:348
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:358
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:360
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:362
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:364
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:369
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:376
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:392
+#: /ayatanawebmail/dialog.py:382
 msgid "Report a bug"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:394
+#: /ayatanawebmail/dialog.py:384
 msgid "Request a feature"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:396 ayatanawebmail/dialog.py:399
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
 #, python-brace-format
 msgid "It's a good idea to add the {labelname} label to your issue."
 msgstr ""
 
-#: ayatanawebmail/dialog.py:397
+#: /ayatanawebmail/dialog.py:387
 msgid "Ask a question"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:400
+#: /ayatanawebmail/dialog.py:390
 msgid "Help translate"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:402
+#: /ayatanawebmail/dialog.py:392
 msgid "Source code"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:404
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:424
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+msgid "Enable notifications"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+msgid "Play sound when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+msgid "Hide message count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:5
-msgid "Display notifications about new mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+msgid "Run this command when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+msgid "Custom sound"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:5
-msgid "Webmail notifications and actions for any desktop"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+msgid "Play a custom sound when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:15
-msgid "Mark all as read"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+msgid "Merge messages"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:20
-msgid "Compose Mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+msgid "Merge messages belonging to the same conversation."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:25
-msgid "Sent"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+msgid "Message action"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:30
-msgid "Inbox"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+msgid "Action to perform when a message is activated."
 msgstr ""
diff --git a/po/wo.po b/po/wo.po
index 6537f09..2ecf1bb 100644
--- a/po/wo.po
+++ b/po/wo.po
@@ -6,9 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail 22.6.28\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/"
-"issues\n"
-"POT-Creation-Date: 2020-08-22 20:15+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -18,299 +17,328 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr ""
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr ""
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr ""
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:204
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr ""
 
-#: ayatanawebmail/application.py:211
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr ""
 
-#: ayatanawebmail/application.py:218
-#: data/usr/share/applications/ayatana-webmail.desktop:35
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr ""
 
-#: ayatanawebmail/application.py:957
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:1110
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr ""
 
-#: ayatanawebmail/application.py:1111
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
-msgid "Unable to connect to account \"{accountName}\", the application will now exit."
+msgid ""
+"Unable to connect to account \"{accountName}\", the application will now "
+"exit."
 msgstr ""
 
-#: ayatanawebmail/application.py:1136
+#: /ayatanawebmail/application.py:1131
 #, python-format
-msgid "You have %d unread mail"
-msgid_plural "You have %d unread mails"
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
 msgstr[0] ""
 
-#: ayatanawebmail/application.py:1163
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr ""
 
-#: ayatanawebmail/application.py:1165
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1167
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1180
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:60
-msgid "If this string starts with http:// or https://, the application will open it in your browser - otherwise, it will be run as a command"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:61
+msgid ""
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:90 ayatanawebmail/dialog.py:104
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:132
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:140
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:141
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:142
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:143
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:204
-msgid "Please visit the following link and enable access for less secure apps:"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:206
-msgid "Access blocked by Google"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:210
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:211
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:234
-msgid "Custom"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:242
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:244
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:286
-msgid "The application will append this string to \"Inbox\" to access a specific message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+#: /ayatanawebmail/dialog.py:276
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:288
+#: /ayatanawebmail/dialog.py:278
 msgid "Account:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:290
+#: /ayatanawebmail/dialog.py:280
 msgid "Server:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:292
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:294
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:296
+#: /ayatanawebmail/dialog.py:286
 msgid "Username:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:298
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:300
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:302
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:296
 msgid "Sent:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:308
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:310
+#: /ayatanawebmail/dialog.py:300
 msgid "Message:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:346
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:347
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:348
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:358
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:360
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:362
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:364
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:369
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:376
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:392
+#: /ayatanawebmail/dialog.py:382
 msgid "Report a bug"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:394
+#: /ayatanawebmail/dialog.py:384
 msgid "Request a feature"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:396 ayatanawebmail/dialog.py:399
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
 #, python-brace-format
 msgid "It's a good idea to add the {labelname} label to your issue."
 msgstr ""
 
-#: ayatanawebmail/dialog.py:397
+#: /ayatanawebmail/dialog.py:387
 msgid "Ask a question"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:400
+#: /ayatanawebmail/dialog.py:390
 msgid "Help translate"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:402
+#: /ayatanawebmail/dialog.py:392
 msgid "Source code"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:404
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:424
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+msgid "Enable notifications"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+msgid "Play sound when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+msgid "Hide message count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:5
-msgid "Display notifications about new mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+msgid "Run this command when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+msgid "Custom sound"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:5
-msgid "Webmail notifications and actions for any desktop"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+msgid "Play a custom sound when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:15
-msgid "Mark all as read"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+msgid "Merge messages"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:20
-msgid "Compose Mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+msgid "Merge messages belonging to the same conversation."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:25
-msgid "Sent"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+msgid "Message action"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:30
-msgid "Inbox"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+msgid "Action to perform when a message is activated."
 msgstr ""
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 76b4638..f5fd79b 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -6,9 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/"
-"issues\n"
-"POT-Creation-Date: 2020-04-03 12:21+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: 2022-01-25 09:55+0000\n"
 "Last-Translator: Eric <alchemillatruth@purelymail.com>\n"
 "Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/"
@@ -21,313 +20,395 @@ msgstr ""
 "X-Generator: Weblate 4.11-dev\n"
 "X-Launchpad-Export-Date: 2020-04-04 05:58+0000\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr "选择账户"
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr "您想要打开哪个账户的命令行/网页页面？"
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr "消息操作"
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr "删除"
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr "标记为已读"
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr "打开消息/运行命令"
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr "发件人"
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr "标题"
 
-#: ayatanawebmail/application.py:205
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr "打开网页版邮箱"
 
-#: ayatanawebmail/application.py:212
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr "清除"
 
-#: ayatanawebmail/application.py:219
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr "设置"
 
-#: ayatanawebmail/application.py:980
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr "无主题"
 
-#: ayatanawebmail/application.py:1132
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr "连接错误"
 
-#: ayatanawebmail/application.py:1133
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
 msgid ""
 "Unable to connect to account \"{accountName}\", the application will now "
 "exit."
 msgstr "不能连接到账户 \"{accountName}\"，程序现在退出。"
 
-#: ayatanawebmail/application.py:1133
-#, python-brace-format
-msgid "You can run \"{command}\" to delete all your login settings."
-msgstr "您可以运行\"{command}\"命令来删除所有的登录设置。"
-
-#: ayatanawebmail/application.py:1158
-#, python-format
-msgid "You have %d unread mail"
-msgid_plural "You have %d unread mails"
+#: /ayatanawebmail/application.py:1131
+#, fuzzy, python-format
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
 msgstr[0] "您有%d封未读邮件"
 
-#: ayatanawebmail/application.py:1185
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr "来自%(t0)s，%(t1)s与其他人"
 
-#: ayatanawebmail/application.py:1187
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr "来自%(t0)s与%(t1)s"
 
-#: ayatanawebmail/application.py:1189
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr "来自%s"
 
-#: ayatanawebmail/application.py:1202
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr "%s 发来的新邮件"
 
-#: ayatanawebmail/dialog.py:60
-msgid "Web page"
-msgstr "网页"
-
-#: ayatanawebmail/dialog.py:61
-msgid "Command"
-msgstr "命令"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
+msgstr ""
 
-#: ayatanawebmail/dialog.py:93
+#: /ayatanawebmail/dialog.py:61
 msgid ""
-"Append an additional string - you can use the $MSG_THREAD and $MSG_UID "
-"placeholders."
-msgstr "附加一个字符串 - 您可以使用$MSG_THREAD和$MSG_UID占位符。"
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
+msgstr ""
 
-#: ayatanawebmail/dialog.py:114 ayatanawebmail/dialog.py:128
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr "（无）"
 
-#: ayatanawebmail/dialog.py:156
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:164
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr "账户"
 
-#: ayatanawebmail/dialog.py:165
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr "选项"
 
-#: ayatanawebmail/dialog.py:166
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr "支持"
 
-#: ayatanawebmail/dialog.py:167
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr "关于"
 
-#: ayatanawebmail/dialog.py:228
-msgid ""
-"Please visit the following link and enable access for less secure apps:"
-msgstr "请访问以下链接并启用对不太安全的应用程序的访问："
-
-#: ayatanawebmail/dialog.py:230
-msgid "Access blocked by Google"
-msgstr "访问被Google阻止"
-
-#: ayatanawebmail/dialog.py:234
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr "连接到邮件账户失败。返回的错误是："
 
-#: ayatanawebmail/dialog.py:235
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr "连接失败"
 
-#: ayatanawebmail/dialog.py:254
-msgid "Choose an account"
-msgstr "选择账户"
-
-#: ayatanawebmail/dialog.py:259
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr "添加"
 
-#: ayatanawebmail/dialog.py:261
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr "移除"
 
-#: ayatanawebmail/dialog.py:276
-msgid "Server data"
-msgstr "服务器信息"
+#: /ayatanawebmail/dialog.py:276
+#, fuzzy
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+msgstr "附加一个字符串 - 您可以使用$MSG_THREAD和$MSG_UID占位符。"
 
-#: ayatanawebmail/dialog.py:278
-msgid "Account data"
-msgstr "帐户信息"
+#: /ayatanawebmail/dialog.py:278
+#, fuzzy
+msgid "Account:"
+msgstr "账户"
 
-#: ayatanawebmail/dialog.py:289
-msgid "Links"
-msgstr "链接"
+#: /ayatanawebmail/dialog.py:280
+#, fuzzy
+msgid "Server:"
+msgstr "服务器信息"
 
-#: ayatanawebmail/dialog.py:297
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr "服务器地址："
 
-#: ayatanawebmail/dialog.py:299
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr "端口："
 
-#: ayatanawebmail/dialog.py:302
-msgid "Login:"
-msgstr "用户名："
+#: /ayatanawebmail/dialog.py:286
+msgid "Username:"
+msgstr ""
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr "密码："
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr "文件夹："
 
-#: ayatanawebmail/dialog.py:309
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr "主页："
 
-#: ayatanawebmail/dialog.py:311
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr "撰写邮件："
 
-#: ayatanawebmail/dialog.py:313
+#: /ayatanawebmail/dialog.py:296
+msgid "Sent:"
+msgstr "已发邮件："
+
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr "收件箱："
 
-#: ayatanawebmail/dialog.py:316
-msgid "Sent:"
-msgstr "已发邮件："
+#: /ayatanawebmail/dialog.py:300
+#, fuzzy
+msgid "Message:"
+msgstr "消息操作"
 
-#: ayatanawebmail/dialog.py:354
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr "标记为已读"
 
-#: ayatanawebmail/dialog.py:355
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr "在浏览器中打开邮件/执行命令"
 
-#: ayatanawebmail/dialog.py:356
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr "询问做什么"
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr "启用通知："
 
-#: ayatanawebmail/dialog.py:368
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr "收到邮件时播放声音："
 
-#: ayatanawebmail/dialog.py:370
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr "合并同一对话中的邮件："
 
-#: ayatanawebmail/dialog.py:372
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr "当为0时隐藏计数："
 
-#: ayatanawebmail/dialog.py:374
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr "当邮件被激活时："
 
-#: ayatanawebmail/dialog.py:377
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr "当收到邮件时执行此命令："
 
-#: ayatanawebmail/dialog.py:384
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr "自定义要播放的声音："
 
-#: ayatanawebmail/dialog.py:400
-msgid "Report a bug/Request a feature"
+#: /ayatanawebmail/dialog.py:382
+msgid "Report a bug"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:384
+#, fuzzy
+msgid "Request a feature"
 msgstr "报告Bug/提出建议"
 
-#: ayatanawebmail/dialog.py:402
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
+#, python-brace-format
+msgid "It's a good idea to add the {labelname} label to your issue."
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:387
 msgid "Ask a question"
 msgstr "问个问题"
 
-#: ayatanawebmail/dialog.py:404
+#: /ayatanawebmail/dialog.py:390
 msgid "Help translate"
 msgstr "帮助翻译"
 
-#: ayatanawebmail/dialog.py:406
-msgid "Project page"
-msgstr "项目主页"
-
-#: ayatanawebmail/dialog.py:408
+#: /ayatanawebmail/dialog.py:392
 msgid "Source code"
 msgstr "源代码"
 
-#: ayatanawebmail/dialog.py:410
-msgid "Repository"
-msgstr "软件库"
-
-#: ayatanawebmail/dialog.py:412
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr "主页"
 
-#: ayatanawebmail/dialog.py:426
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  aerowolf https://launchpad.net/~aerowolf-tom"
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:39
-msgid "Webmail notifications and actions for any desktop"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:74
-msgid "Mark all as read"
-msgstr "全部标记为已读"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+#, fuzzy
+msgid "Enable notifications"
+msgstr "启用通知："
 
-#: data/usr/share/applications/ayatana-webmail.desktop:112
-msgid "Compose Mail"
-msgstr "撰写邮件"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:152
-msgid "Sent"
-msgstr "已发邮件"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:228
-msgid "Inbox"
-msgstr "收件箱"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+#, fuzzy
+msgid "Play sound when new messages arrive."
+msgstr "收到邮件时播放声音："
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+#, fuzzy
+msgid "Hide message count"
+msgstr "打开消息/运行命令"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:38
-msgid "Display notifications about new mail"
-msgstr "显示新邮件通知"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+#, fuzzy
+msgid "Run this command when new messages arrive."
+msgstr "当收到邮件时执行此命令："
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+#, fuzzy
+msgid "Custom sound"
+msgstr "自定义要播放的声音："
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+#, fuzzy
+msgid "Play a custom sound when new messages arrive."
+msgstr "收到邮件时播放声音："
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+#, fuzzy
+msgid "Merge messages"
+msgstr "标记为已读"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+#, fuzzy
+msgid "Merge messages belonging to the same conversation."
+msgstr "合并同一对话中的邮件："
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+#, fuzzy
+msgid "Message action"
+msgstr "消息操作"
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+#, fuzzy
+msgid "Action to perform when a message is activated."
+msgstr "当邮件被激活时："
+
+#, python-brace-format
+#~ msgid "You can run \"{command}\" to delete all your login settings."
+#~ msgstr "您可以运行\"{command}\"命令来删除所有的登录设置。"
+
+#~ msgid "Web page"
+#~ msgstr "网页"
+
+#~ msgid "Command"
+#~ msgstr "命令"
+
+#~ msgid ""
+#~ "Please visit the following link and enable access for less secure apps:"
+#~ msgstr "请访问以下链接并启用对不太安全的应用程序的访问："
+
+#~ msgid "Access blocked by Google"
+#~ msgstr "访问被Google阻止"
+
+#~ msgid "Choose an account"
+#~ msgstr "选择账户"
+
+#~ msgid "Account data"
+#~ msgstr "帐户信息"
+
+#~ msgid "Links"
+#~ msgstr "链接"
+
+#~ msgid "Login:"
+#~ msgstr "用户名："
+
+#~ msgid "Project page"
+#~ msgstr "项目主页"
+
+#~ msgid "Repository"
+#~ msgstr "软件库"
+
+#~ msgid "Mark all as read"
+#~ msgstr "全部标记为已读"
+
+#~ msgid "Compose Mail"
+#~ msgstr "撰写邮件"
+
+#~ msgid "Sent"
+#~ msgstr "已发邮件"
+
+#~ msgid "Inbox"
+#~ msgstr "收件箱"
+
+#~ msgid "Display notifications about new mail"
+#~ msgstr "显示新邮件通知"
diff --git a/po/zh_HK.po b/po/zh_HK.po
new file mode 100644
index 0000000..0ee3b4f
--- /dev/null
+++ b/po/zh_HK.po
@@ -0,0 +1,345 @@
+# Chinese translations for PACKAGE package.
+# Copyright (C) 2022 THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# Automatically generated, 2022.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
+"PO-Revision-Date: 2022-09-11 12:53+0200\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: zh_HK\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ASCII\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
+
+#: /ayatanawebmail/accounts.py:18
+msgid "Select account"
+msgstr ""
+
+#: /ayatanawebmail/accounts.py:29
+msgid "Which account's command/web page would you like to open?"
+msgstr ""
+
+#: /ayatanawebmail/actions.py:15
+msgid "Message actions"
+msgstr ""
+
+#: /ayatanawebmail/actions.py:15
+msgid "Delete"
+msgstr ""
+
+#: /ayatanawebmail/actions.py:15
+msgid "Mark as read"
+msgstr ""
+
+#: /ayatanawebmail/actions.py:15
+msgid "Open message/Run command"
+msgstr ""
+
+#: /ayatanawebmail/actions.py:24
+msgid "Sender"
+msgstr ""
+
+#: /ayatanawebmail/actions.py:26
+msgid "Subject"
+msgstr ""
+
+#: /ayatanawebmail/application.py:178
+msgid "Open webmail home page"
+msgstr ""
+
+#: /ayatanawebmail/application.py:185
+msgid "Clear"
+msgstr ""
+
+#: /ayatanawebmail/application.py:192
+msgid "Settings"
+msgstr ""
+
+#: /ayatanawebmail/application.py:945
+msgid "No subject"
+msgstr ""
+
+#: /ayatanawebmail/application.py:1105
+msgid "Connection error"
+msgstr ""
+
+#: /ayatanawebmail/application.py:1106
+#, python-brace-format
+msgid ""
+"Unable to connect to account \"{accountName}\", the application will now "
+"exit."
+msgstr ""
+
+#: /ayatanawebmail/application.py:1131
+#, python-format
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
+msgstr[0] ""
+msgstr[1] ""
+
+#: /ayatanawebmail/application.py:1158
+#, python-format
+msgid "from %(t0)s, %(t1)s and others"
+msgstr ""
+
+#: /ayatanawebmail/application.py:1160
+#, python-format
+msgid "from %(t0)s and %(t1)s"
+msgstr ""
+
+#: /ayatanawebmail/application.py:1162
+#, python-format
+msgid "from %s"
+msgstr ""
+
+#: /ayatanawebmail/application.py:1175
+#, python-format
+msgid "New mail from %s"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:61
+msgid ""
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
+msgid "(None)"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:133
+msgid "Ayatana Webmail Preferences"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:141
+msgid "Accounts"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:142
+msgid "Options"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:143
+msgid "Support"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:144
+msgid "About"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:203
+msgid "Failed to connect to mail account. The returned error was:"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:204
+msgid "Connection failure"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:232
+msgid "Add"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:234
+msgid "Remove"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:276
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:278
+msgid "Account:"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:280
+msgid "Server:"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:282
+msgid "Host:"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:284
+msgid "Port:"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:286
+msgid "Username:"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:288
+msgid "Password:"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:290
+msgid "Folders:"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:292
+msgid "Home:"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:294
+msgid "Compose:"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:296
+msgid "Sent:"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:298
+msgid "Inbox:"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:300
+msgid "Message:"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:336
+msgid "Mark message as read"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:337
+msgid "Open message in browser/Execute command"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:338
+msgid "Ask me what to do"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:348
+msgid "Enable notifications:"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:350
+msgid "Play sound when a message is received:"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:352
+msgid "Merge messages from the same conversation:"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:354
+msgid "Hide count when zero:"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:356
+msgid "When a message is activated:"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:359
+msgid "Execute this command when a message is received:"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:366
+msgid "Custom sound to play:"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:382
+msgid "Report a bug"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:384
+msgid "Request a feature"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
+#, python-brace-format
+msgid "It's a good idea to add the {labelname} label to your issue."
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:387
+msgid "Ask a question"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:390
+msgid "Help translate"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:392
+msgid "Source code"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:394
+msgid "Home page"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:414
+msgid "translator-credits"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+msgid "Enable notifications"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+msgid "Play sound when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+msgid "Hide message count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+msgid "Run this command when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+msgid "Custom sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+msgid "Play a custom sound when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+msgid "Merge messages"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+msgid "Merge messages belonging to the same conversation."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+msgid "Message action"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+msgid "Action to perform when a message is activated."
+msgstr ""
diff --git a/po/zh_LATN@pinyin.po b/po/zh_LATN@pinyin.po
index aebf6a1..2634659 100644
--- a/po/zh_LATN@pinyin.po
+++ b/po/zh_LATN@pinyin.po
@@ -6,9 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayatana-webmail 22.6.28\n"
-"Report-Msgid-Bugs-To: https://github.com/AyatanaIndicators/ayatana-webmail/"
-"issues\n"
-"POT-Creation-Date: 2021-01-03 14:41+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -18,300 +17,329 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ayatanawebmail/accounts.py:18
+#: /ayatanawebmail/accounts.py:18
 msgid "Select account"
 msgstr ""
 
-#: ayatanawebmail/accounts.py:29
+#: /ayatanawebmail/accounts.py:29
 msgid "Which account's command/web page would you like to open?"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Message actions"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Delete"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Mark as read"
 msgstr ""
 
-#: ayatanawebmail/actions.py:15
+#: /ayatanawebmail/actions.py:15
 msgid "Open message/Run command"
 msgstr ""
 
-#: ayatanawebmail/actions.py:24
+#: /ayatanawebmail/actions.py:24
 msgid "Sender"
 msgstr ""
 
-#: ayatanawebmail/actions.py:26
+#: /ayatanawebmail/actions.py:26
 msgid "Subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:204
+#: /ayatanawebmail/application.py:178
 msgid "Open webmail home page"
 msgstr ""
 
-#: ayatanawebmail/application.py:211
+#: /ayatanawebmail/application.py:185
 msgid "Clear"
 msgstr ""
 
-#: ayatanawebmail/application.py:218
-#: data/usr/share/applications/ayatana-webmail.desktop:35
+#: /ayatanawebmail/application.py:192
 msgid "Settings"
 msgstr ""
 
-#: ayatanawebmail/application.py:957
+#: /ayatanawebmail/application.py:945
 msgid "No subject"
 msgstr ""
 
-#: ayatanawebmail/application.py:1110
+#: /ayatanawebmail/application.py:1105
 msgid "Connection error"
 msgstr ""
 
-#: ayatanawebmail/application.py:1111
+#: /ayatanawebmail/application.py:1106
 #, python-brace-format
-msgid "Unable to connect to account \"{accountName}\", the application will now exit."
+msgid ""
+"Unable to connect to account \"{accountName}\", the application will now "
+"exit."
 msgstr ""
 
-#: ayatanawebmail/application.py:1136
+#: /ayatanawebmail/application.py:1131
 #, python-format
 msgid "You have %d unread message"
 msgid_plural "You have %d unread messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ayatanawebmail/application.py:1163
+#: /ayatanawebmail/application.py:1158
 #, python-format
 msgid "from %(t0)s, %(t1)s and others"
 msgstr ""
 
-#: ayatanawebmail/application.py:1165
+#: /ayatanawebmail/application.py:1160
 #, python-format
 msgid "from %(t0)s and %(t1)s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1167
+#: /ayatanawebmail/application.py:1162
 #, python-format
 msgid "from %s"
 msgstr ""
 
-#: ayatanawebmail/application.py:1180
+#: /ayatanawebmail/application.py:1175
 #, python-format
 msgid "New mail from %s"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:60
-msgid "If this string starts with http:// or https://, the application will open it in your browser - otherwise, it will be run as a command"
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:61
+msgid ""
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:90 ayatanawebmail/dialog.py:104
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
 msgid "(None)"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:132
+#: /ayatanawebmail/dialog.py:133
 msgid "Ayatana Webmail Preferences"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:140
+#: /ayatanawebmail/dialog.py:141
 msgid "Accounts"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:141
+#: /ayatanawebmail/dialog.py:142
 msgid "Options"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:142
+#: /ayatanawebmail/dialog.py:143
 msgid "Support"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:143
+#: /ayatanawebmail/dialog.py:144
 msgid "About"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:204
-msgid "Please visit the following link and enable access for less secure apps:"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:206
-msgid "Access blocked by Google"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:210
+#: /ayatanawebmail/dialog.py:203
 msgid "Failed to connect to mail account. The returned error was:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:211
+#: /ayatanawebmail/dialog.py:204
 msgid "Connection failure"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:234
-msgid "Custom"
-msgstr ""
-
-#: ayatanawebmail/dialog.py:242
+#: /ayatanawebmail/dialog.py:232
 msgid "Add"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:244
+#: /ayatanawebmail/dialog.py:234
 msgid "Remove"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:286
-msgid "The application will append this string to \"Inbox\" to access a specific message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+#: /ayatanawebmail/dialog.py:276
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:288
+#: /ayatanawebmail/dialog.py:278
 msgid "Account:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:290
+#: /ayatanawebmail/dialog.py:280
 msgid "Server:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:292
+#: /ayatanawebmail/dialog.py:282
 msgid "Host:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:294
+#: /ayatanawebmail/dialog.py:284
 msgid "Port:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:296
+#: /ayatanawebmail/dialog.py:286
 msgid "Username:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:298
+#: /ayatanawebmail/dialog.py:288
 msgid "Password:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:300
+#: /ayatanawebmail/dialog.py:290
 msgid "Folders:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:302
+#: /ayatanawebmail/dialog.py:292
 msgid "Home:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:304
+#: /ayatanawebmail/dialog.py:294
 msgid "Compose:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:306
+#: /ayatanawebmail/dialog.py:296
 msgid "Sent:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:308
+#: /ayatanawebmail/dialog.py:298
 msgid "Inbox:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:310
+#: /ayatanawebmail/dialog.py:300
 msgid "Message:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:346
+#: /ayatanawebmail/dialog.py:336
 msgid "Mark message as read"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:347
+#: /ayatanawebmail/dialog.py:337
 msgid "Open message in browser/Execute command"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:348
+#: /ayatanawebmail/dialog.py:338
 msgid "Ask me what to do"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:358
+#: /ayatanawebmail/dialog.py:348
 msgid "Enable notifications:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:360
+#: /ayatanawebmail/dialog.py:350
 msgid "Play sound when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:362
+#: /ayatanawebmail/dialog.py:352
 msgid "Merge messages from the same conversation:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:364
+#: /ayatanawebmail/dialog.py:354
 msgid "Hide count when zero:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:366
+#: /ayatanawebmail/dialog.py:356
 msgid "When a message is activated:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:369
+#: /ayatanawebmail/dialog.py:359
 msgid "Execute this command when a message is received:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:376
+#: /ayatanawebmail/dialog.py:366
 msgid "Custom sound to play:"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:392
+#: /ayatanawebmail/dialog.py:382
 msgid "Report a bug"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:394
+#: /ayatanawebmail/dialog.py:384
 msgid "Request a feature"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:396 ayatanawebmail/dialog.py:399
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
 #, python-brace-format
 msgid "It's a good idea to add the {labelname} label to your issue."
 msgstr ""
 
-#: ayatanawebmail/dialog.py:397
+#: /ayatanawebmail/dialog.py:387
 msgid "Ask a question"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:400
+#: /ayatanawebmail/dialog.py:390
 msgid "Help translate"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:402
+#: /ayatanawebmail/dialog.py:392
 msgid "Source code"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:404
+#: /ayatanawebmail/dialog.py:394
 msgid "Home page"
 msgstr ""
 
-#: ayatanawebmail/dialog.py:424
+#: /ayatanawebmail/dialog.py:414
 msgid "translator-credits"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:4
-msgid "Ayatana Webmail (service)"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+msgid "Enable notifications"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+msgid "Play sound when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+msgid "Hide message count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
 msgstr ""
 
-#: data/etc/xdg/autostart/ayatana-webmail-autostart.desktop:5
-msgid "Display notifications about new mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+msgid "Run this command when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:4
-msgid "Ayatana Webmail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+msgid "Custom sound"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:5
-msgid "Webmail notifications and actions for any desktop"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+msgid "Play a custom sound when new messages arrive."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:15
-msgid "Mark all as read"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+msgid "Merge messages"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:20
-msgid "Compose Mail"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+msgid "Merge messages belonging to the same conversation."
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:25
-msgid "Sent"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+msgid "Message action"
 msgstr ""
 
-#: data/usr/share/applications/ayatana-webmail.desktop:30
-msgid "Inbox"
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+msgid "Action to perform when a message is activated."
 msgstr ""
diff --git a/po/zh_TW.po b/po/zh_TW.po
new file mode 100644
index 0000000..f315045
--- /dev/null
+++ b/po/zh_TW.po
@@ -0,0 +1,345 @@
+# Chinese translations for PACKAGE package.
+# Copyright (C) 2022 THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# Automatically generated, 2022.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-09-11 12:53+0200\n"
+"PO-Revision-Date: 2022-09-11 12:53+0200\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: zh_TW\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ASCII\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
+
+#: /ayatanawebmail/accounts.py:18
+msgid "Select account"
+msgstr ""
+
+#: /ayatanawebmail/accounts.py:29
+msgid "Which account's command/web page would you like to open?"
+msgstr ""
+
+#: /ayatanawebmail/actions.py:15
+msgid "Message actions"
+msgstr ""
+
+#: /ayatanawebmail/actions.py:15
+msgid "Delete"
+msgstr ""
+
+#: /ayatanawebmail/actions.py:15
+msgid "Mark as read"
+msgstr ""
+
+#: /ayatanawebmail/actions.py:15
+msgid "Open message/Run command"
+msgstr ""
+
+#: /ayatanawebmail/actions.py:24
+msgid "Sender"
+msgstr ""
+
+#: /ayatanawebmail/actions.py:26
+msgid "Subject"
+msgstr ""
+
+#: /ayatanawebmail/application.py:178
+msgid "Open webmail home page"
+msgstr ""
+
+#: /ayatanawebmail/application.py:185
+msgid "Clear"
+msgstr ""
+
+#: /ayatanawebmail/application.py:192
+msgid "Settings"
+msgstr ""
+
+#: /ayatanawebmail/application.py:945
+msgid "No subject"
+msgstr ""
+
+#: /ayatanawebmail/application.py:1105
+msgid "Connection error"
+msgstr ""
+
+#: /ayatanawebmail/application.py:1106
+#, python-brace-format
+msgid ""
+"Unable to connect to account \"{accountName}\", the application will now "
+"exit."
+msgstr ""
+
+#: /ayatanawebmail/application.py:1131
+#, python-format
+msgid "You have %d unread message"
+msgid_plural "You have %d unread messages"
+msgstr[0] ""
+msgstr[1] ""
+
+#: /ayatanawebmail/application.py:1158
+#, python-format
+msgid "from %(t0)s, %(t1)s and others"
+msgstr ""
+
+#: /ayatanawebmail/application.py:1160
+#, python-format
+msgid "from %(t0)s and %(t1)s"
+msgstr ""
+
+#: /ayatanawebmail/application.py:1162
+#, python-format
+msgid "from %s"
+msgstr ""
+
+#: /ayatanawebmail/application.py:1175
+#, python-format
+msgid "New mail from %s"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:17
+msgid "Custom"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:61
+msgid ""
+"If this string starts with http:// or https://, the application will open it "
+"in your browser - otherwise, it will be run as a command"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:91 /ayatanawebmail/dialog.py:105
+msgid "(None)"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:133
+msgid "Ayatana Webmail Preferences"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:141
+msgid "Accounts"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:142
+msgid "Options"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:143
+msgid "Support"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:144
+msgid "About"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:203
+msgid "Failed to connect to mail account. The returned error was:"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:204
+msgid "Connection failure"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:232
+msgid "Add"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:234
+msgid "Remove"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:276
+msgid ""
+"The application will append this string to \"Inbox\" to access a specific "
+"message - you can use the $MSG_THREAD and $MSG_UID placeholders"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:278
+msgid "Account:"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:280
+msgid "Server:"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:282
+msgid "Host:"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:284
+msgid "Port:"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:286
+msgid "Username:"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:288
+msgid "Password:"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:290
+msgid "Folders:"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:292
+msgid "Home:"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:294
+msgid "Compose:"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:296
+msgid "Sent:"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:298
+msgid "Inbox:"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:300
+msgid "Message:"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:336
+msgid "Mark message as read"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:337
+msgid "Open message in browser/Execute command"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:338
+msgid "Ask me what to do"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:348
+msgid "Enable notifications:"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:350
+msgid "Play sound when a message is received:"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:352
+msgid "Merge messages from the same conversation:"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:354
+msgid "Hide count when zero:"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:356
+msgid "When a message is activated:"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:359
+msgid "Execute this command when a message is received:"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:366
+msgid "Custom sound to play:"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:382
+msgid "Report a bug"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:384
+msgid "Request a feature"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:386 /ayatanawebmail/dialog.py:389
+#, python-brace-format
+msgid "It's a good idea to add the {labelname} label to your issue."
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:387
+msgid "Ask a question"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:390
+msgid "Help translate"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:392
+msgid "Source code"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:394
+msgid "Home page"
+msgstr ""
+
+#: /ayatanawebmail/dialog.py:414
+msgid "translator-credits"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:1
+msgid "Maximum item count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:2
+msgid "Limit the number of mails to retrieve per folder."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:3
+msgid "Enable notifications"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:4
+msgid "Show OSD notifications when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:5
+msgid "Enable sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:6
+msgid "Play sound when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:7
+msgid "Hide message count"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:8
+msgid "Hide message count when there are no messages."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:9
+msgid "Execute on receive"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:10
+msgid "Run this command when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:11
+msgid "Custom sound"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:12
+msgid "Play a custom sound when new messages arrive."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:13
+msgid "Merge messages"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:14
+msgid "Merge messages belonging to the same conversation."
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:15
+msgid "Message action"
+msgstr ""
+
+#: /data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml.h:16
+msgid "Action to perform when a message is activated."
+msgstr ""
diff --git a/setup.py b/setup.py
index 06a8304..cd723a2 100755
--- a/setup.py
+++ b/setup.py
@@ -51,6 +51,9 @@ for strRoot, lstDirnames, lstFilenames in os.walk('po'):
 
     for strFilename in lstFilenames:
 
+        if not strFilename.endswith('.po'):
+            continue
+
         strLocale = os.path.splitext(strFilename)[0]
 
         if strLocale != APPNAME:
diff --git a/update-po.sh b/update-po.sh
new file mode 100755
index 0000000..6a6ced8
--- /dev/null
+++ b/update-po.sh
@@ -0,0 +1,37 @@
+#!/bin/bash
+
+set -x
+
+# Copyright (C) 2017 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+#
+# This package is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 3 of the License.
+#
+# This package is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>
+
+GETTEXT_DOMAIN="ayatanawebmail"
+
+cp po/${GETTEXT_DOMAIN}.pot po/${GETTEXT_DOMAIN}.pot~
+
+cd po/
+cat LINGUAS | while read lingua; do
+	if [ ! -e ${lingua}.po ]; then
+		 msginit --input=${GETTEXT_DOMAIN}.pot --locale=${lingua} --no-translator --output-file=$lingua.po
+	else
+		intltool-update --gettext-package ${GETTEXT_DOMAIN} $(basename ${lingua})
+	fi
+
+	sed -e 's@\.\.@@g'			\
+	    -i ${lingua}.po
+
+done
+cd - 1>/dev/null
+
+mv po/${GETTEXT_DOMAIN}.pot~ po/${GETTEXT_DOMAIN}.pot
diff --git a/update-pot.sh b/update-pot.sh
new file mode 100755
index 0000000..bdff0c6
--- /dev/null
+++ b/update-pot.sh
@@ -0,0 +1,31 @@
+#!/bin/bash
+
+# Copyright (C) 2017 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+#
+# This package is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 3 of the License.
+#
+# This package is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>
+
+GETTEXT_DOMAIN="ayatanawebmail"
+
+cp data/etc/xdg/autostart/ayatana-webmail-autostart.desktop      data/etc/xdg/autostart/ayatana-webmail-autostart.desktop.keep
+cp data/usr/share/applications/ayatana-webmail.desktop           data/usr/share/applications/ayatana-webmail.desktop.keep
+
+./setup.py build_i18n 1>/dev/null 2>/dev/null
+
+mv data/etc/xdg/autostart/ayatana-webmail-autostart.desktop.keep data/etc/xdg/autostart/ayatana-webmail-autostart.desktop
+mv data/usr/share/applications/ayatana-webmail.desktop.keep      data/usr/share/applications/ayatana-webmail.desktop
+
+rm ./build -Rf
+rm ./data/usr/share/locale/ -Rf
+
+sed -e 's@#: \.\./@#: @g'		\
+    -i po/${GETTEXT_DOMAIN}.pot