diff --git a/po/he.po b/po/he.po
index 1bdba30f..5c6c23e6 100644
--- a/po/he.po
+++ b/po/he.po
@@ -16,8 +16,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: geary-0.4.1\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/geary/issues\n"
-"POT-Creation-Date: 2022-09-10 11:23+0000\n"
-"PO-Revision-Date: 2022-09-11 07:44+0300\n"
+"POT-Creation-Date: 2022-10-01 12:53+0000\n"
+"PO-Revision-Date: 2022-10-01 21:01+0300\n"
 "Last-Translator: Yosef Or Boczko <yoseforb@gmail.com>\n"
 "Language-Team: Hebrew <>\n"
 "Language: he\n"
@@ -26,7 +26,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : n==2 ? 1 : n>10 && n%10==0 ? "
 "2 : 3)\n"
-"X-Generator: Gtranslator 40.0\n"
+"X-Generator: Gtranslator 42.0\n"
 
 #: desktop/geary-attach.contract.desktop.in:3
 msgid "Send by email"
@@ -41,7 +41,7 @@ msgstr "שליחת קבצים באמצעות Geary"
 #: desktop/org.gnome.Geary.appdata.xml.in.in:11
 #: desktop/org.gnome.Geary.desktop.in.in:3
 #: src/client/accounts/accounts-editor-servers-pane.vala:551
-#: src/client/application/application-main-window.vala:706
+#: src/client/application/application-main-window.vala:695
 msgid "Geary"
 msgstr "Geary"
 
@@ -625,12 +625,12 @@ msgstr[2] "‏%d ימים אחורה"
 msgstr[3] "‏%d ימים אחורה"
 
 #: src/client/accounts/accounts-editor-list-pane.vala:234
-#: src/client/application/application-main-window.vala:2273
+#: src/client/application/application-main-window.vala:2287
 msgid "Undo"
 msgstr "ביטול"
 
 #: src/client/accounts/accounts-editor-list-pane.vala:243
-#: src/client/application/application-main-window.vala:2256
+#: src/client/application/application-main-window.vala:2270
 msgid "Redo"
 msgstr "ביצוע חוזר"
 
@@ -713,7 +713,7 @@ msgstr "TLS"
 #. account
 #. Translators: An info bar button label
 #: src/client/accounts/accounts-editor-row.vala:535
-#: src/client/application/application-main-window.vala:648
+#: src/client/application/application-main-window.vala:637
 msgid "Login"
 msgstr "התחברות"
 
@@ -1146,27 +1146,27 @@ msgstr "נשלחת הודעה אל %s"
 
 #. / Translators: The label for an in-app notification. The
 #. / string substitution is a list of recipients of the email.
-#: src/client/application/application-controller.vala:2512
+#: src/client/application/application-controller.vala:2514
 #, c-format
 msgid "Email to %s queued for delivery"
 msgstr "הודעה אל %s ממתינה בתור לשליחה"
 
 #. / Translators: The label for an in-app notification. The
 #. / string substitution is a list of recipients of the email.
-#: src/client/application/application-controller.vala:2576
+#: src/client/application/application-controller.vala:2578
 #, c-format
 msgid "Email to %s saved"
 msgstr "נשמרה הודעה אל %s"
 
 #. / Translators: A label for an in-app notification.
-#: src/client/application/application-controller.vala:2591
-#: src/client/application/application-controller.vala:2649
+#: src/client/application/application-controller.vala:2593
+#: src/client/application/application-controller.vala:2651
 msgid "Composer could not be restored"
 msgstr "לא ניתן לאחזר את יוצר ההודעות"
 
 #. / Translators: The label for an in-app notification. The
 #. / string substitution is a list of recipients of the email.
-#: src/client/application/application-controller.vala:2634
+#: src/client/application/application-controller.vala:2636
 #, c-format
 msgid "Email to %s discarded"
 msgstr "הודעה אל %s הושלכה"
@@ -1183,86 +1183,83 @@ msgid "Account update"
 msgstr "עדכון חשבון"
 
 #. Translators: An info bar status label
-#: src/client/application/application-main-window.vala:634
+#: src/client/application/application-main-window.vala:623
 msgid "Working offline"
 msgstr "פועל בצורה לא מקוונת"
 
 #. Translators: An info bar description label
-#: src/client/application/application-main-window.vala:636
+#: src/client/application/application-main-window.vala:625
 msgid "You will not be able to send or receive email until re-connected."
 msgstr "לא ניתן לשלוח או לקבל הודעות עד להתחברות מחודשת."
 
 #. Translators: An info bar status label
-#: src/client/application/application-main-window.vala:643
+#: src/client/application/application-main-window.vala:632
 msgid "Login problem"
 msgstr "בעיית התחברות"
 
 #. Translators: An info bar description label
-#: src/client/application/application-main-window.vala:645
+#: src/client/application/application-main-window.vala:634
 msgid "An account has reported an incorrect login or password."
 msgstr "החשבון דיווח על התחברות או ססמה לא נכונה."
 
 #. Translators: An info bar button tool-tip
-#: src/client/application/application-main-window.vala:652
+#: src/client/application/application-main-window.vala:641
 msgid "Retry login, you will be prompted for your password"
 msgstr "יש לנסות להתחבר שוב, ססמתך תידרש"
 
 #. Translators: An info bar status label
-#: src/client/application/application-main-window.vala:659
+#: src/client/application/application-main-window.vala:648
 msgid "Security problem"
 msgstr "בעיית אבטחה"
 
 #. Translators: An info bar description label
-#: src/client/application/application-main-window.vala:661
+#: src/client/application/application-main-window.vala:650
 msgid "An account has reported an untrusted server."
 msgstr "החשבון דיווח על שרת לא אמין."
 
 #. Translators: An info bar button label
-#: src/client/application/application-main-window.vala:664
+#: src/client/application/application-main-window.vala:653
 msgid "Check"
 msgstr "בדיקה"
 
 #. Translators: An info bar button tool-tip
-#: src/client/application/application-main-window.vala:668
+#: src/client/application/application-main-window.vala:657
 msgid "Check the security details for the connection"
 msgstr "בדיקת פרטי אבטחת ההתחברות"
 
 #. / Translators: Main window title, first string
 #. / substitution being the currently selected folder name,
 #. / the second being the selected account name.
-#: src/client/application/application-main-window.vala:715
+#: src/client/application/application-main-window.vala:704
 #, c-format
 msgid "%s — %s"
 msgstr "%s — %s"
 
-#. Translators: The name of the folder group containing
-#. folders created by people (as opposed to special-use
-#. folders)
-#: src/client/application/application-main-window.vala:1105
-#: src/client/folder-list/folder-list-account-branch.vala:46
+#: src/client/application/application-main-window.vala:1094
+#: src/client/folder-list/folder-list-account-branch.vala:49
 msgid "Labels"
 msgstr "תוויות"
 
-#: src/client/application/application-main-window.vala:1433
+#: src/client/application/application-main-window.vala:1417
 #, c-format
 msgid "Empty all email from your %s folder?"
 msgstr "ריקון כל הדואר מהתיקייה %s?"
 
-#: src/client/application/application-main-window.vala:1434
+#: src/client/application/application-main-window.vala:1418
 msgid "This removes the email from Geary and your email server."
 msgstr "פעולה זו תמחוק את הדואר מ־Geary וכן משרת הדוא״ל שלך."
 
-#: src/client/application/application-main-window.vala:1435
+#: src/client/application/application-main-window.vala:1419
 msgid "This cannot be undone."
 msgstr "פעולה זאת לא ניתנת לביטול."
 
-#: src/client/application/application-main-window.vala:1436
+#: src/client/application/application-main-window.vala:1420
 #, c-format
 msgid "Empty %s"
 msgstr "ריקון %s"
 
 #. / Translators: Primary text for a confirmation dialog
-#: src/client/application/application-main-window.vala:1493
+#: src/client/application/application-main-window.vala:1477
 msgid "Do you want to permanently delete this conversation?"
 msgid_plural "Do you want to permanently delete these conversations?"
 msgstr[0] "האם ברצונך למחוק תכתובת זו לצמיתות?"
@@ -1270,13 +1267,13 @@ msgstr[1] "האם ברצונך למחוק תכתובות אלה לצמיתות?"
 msgstr[2] "האם ברצונך למחוק תכתובות אלה לצמיתות?"
 msgstr[3] "האם ברצונך למחוק תכתובת זו לצמיתות?"
 
-#: src/client/application/application-main-window.vala:1498
-#: src/client/application/application-main-window.vala:1513
+#: src/client/application/application-main-window.vala:1482
+#: src/client/application/application-main-window.vala:1497
 msgid "Delete"
 msgstr "מחיקה"
 
 #. / Translators: Primary text for a confirmation dialog
-#: src/client/application/application-main-window.vala:1508
+#: src/client/application/application-main-window.vala:1492
 msgid "Do you want to permanently delete this message?"
 msgid_plural "Do you want to permanently delete these messages?"
 msgstr[0] "האם ברצונך למחוק הודעה זו לצמיתות?"
@@ -1284,7 +1281,7 @@ msgstr[1] "האם ברצונך למחוק הודעות אלה לצמיתות?"
 msgstr[2] "האם ברצונך למחוק הודעות אלה לצמיתות?"
 msgstr[3] "האם ברצונך למחוק הודעות אלה לצמיתות?"
 
-#: src/client/application/application-main-window.vala:1805
+#: src/client/application/application-main-window.vala:1808
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
@@ -1320,7 +1317,7 @@ msgstr ""
 msgid "Don’t _ask me again"
 msgstr "לא ל_שאול אותי שוב"
 
-#: src/client/components/components-conversation-actions.vala:109
+#: src/client/components/components-conversation-actions.vala:112
 msgid "Mark conversation"
 msgid_plural "Mark conversations"
 msgstr[0] "סימון תכתובת"
@@ -1328,15 +1325,7 @@ msgstr[1] "סימון תכתובות"
 msgstr[2] "סימון תכתובות"
 msgstr[3] "סימון תכתובות"
 
-#: src/client/components/components-conversation-actions.vala:114
-msgid "Add label to conversation"
-msgid_plural "Add label to conversations"
-msgstr[0] "הוספת תווית לתכתובת"
-msgstr[1] "הוספת תווית לתכתובות"
-msgstr[2] "הוספת תווית לתכתובות"
-msgstr[3] "הוספת תווית לתכתובות"
-
-#: src/client/components/components-conversation-actions.vala:119
+#: src/client/components/components-conversation-actions.vala:118
 msgid "Move conversation"
 msgid_plural "Move conversations"
 msgstr[0] "העברת תכתובת"
@@ -1344,7 +1333,7 @@ msgstr[1] "העברת תכתובות"
 msgstr[2] "העברת תכתובות"
 msgstr[3] "העברת תכתובות"
 
-#: src/client/components/components-conversation-actions.vala:124
+#: src/client/components/components-conversation-actions.vala:123
 #: src/client/conversation-list/conversation-list-view.vala:446
 msgid "Archive conversation"
 msgid_plural "Archive conversations"
@@ -1353,7 +1342,23 @@ msgstr[1] "תיוק תכתובות בארכיון"
 msgstr[2] "תיוק תכתובות בארכיון"
 msgstr[3] "תיוק תכתובות בארכיון"
 
-#: src/client/components/components-conversation-actions.vala:135
+#: src/client/components/components-conversation-actions.vala:133
+msgid "Add label to conversation"
+msgid_plural "Add label to conversations"
+msgstr[0] "הוספת תווית לתכתובת"
+msgstr[1] "הוספת תווית לתכתובות"
+msgstr[2] "הוספת תווית לתכתובות"
+msgstr[3] "הוספת תווית לתכתובות"
+
+#: src/client/components/components-conversation-actions.vala:142
+msgid "Copy conversation"
+msgid_plural "Copy conversations"
+msgstr[0] "העתקת תכתובת"
+msgstr[1] "העתקת תכתובות"
+msgstr[2] "העתקת תכתובות"
+msgstr[3] "העתקת תכתובות"
+
+#: src/client/components/components-conversation-actions.vala:161
 msgid "Move conversation to Trash"
 msgid_plural "Move conversations to Trash"
 msgstr[0] "העברת תכתובת לאשפה"
@@ -1361,7 +1366,7 @@ msgstr[1] "העברת תכתובות לאשפה"
 msgstr[2] "העברת תכתובות לאשפה"
 msgstr[3] "העברת תכתובות לאשפה"
 
-#: src/client/components/components-conversation-actions.vala:145
+#: src/client/components/components-conversation-actions.vala:171
 msgid "Delete conversation"
 msgid_plural "Delete conversations"
 msgstr[0] "מחיקת תכתובת"
@@ -1616,7 +1621,7 @@ msgstr "_סגירה"
 msgid "_Discard"
 msgstr "השל_כה"
 
-#: src/client/components/stock.vala:25 ui/components-main-toolbar-menus.ui:42
+#: src/client/components/stock.vala:25 ui/components-menu-application.ui:20
 msgid "_Help"
 msgstr "_עזרה"
 
@@ -1626,7 +1631,7 @@ msgstr "_עזרה"
 msgid "_Open"
 msgstr "_פתיחה"
 
-#: src/client/components/stock.vala:27 ui/components-main-toolbar-menus.ui:32
+#: src/client/components/stock.vala:27 ui/components-menu-application.ui:10
 msgid "_Preferences"
 msgstr "הע_דפות"
 
@@ -1863,22 +1868,22 @@ msgstr[2] "_מחיקת תכתובות"
 msgstr[3] "_מחיקת תכתובות"
 
 #: src/client/conversation-list/conversation-list-view.vala:415
-#: ui/components-main-toolbar-menus.ui:5
+#: ui/components-menu-conversation.ui:5
 msgid "Mark as _Read"
 msgstr "סימון כ_נקרא"
 
 #: src/client/conversation-list/conversation-list-view.vala:423
-#: ui/components-main-toolbar-menus.ui:9
+#: ui/components-menu-conversation.ui:9
 msgid "Mark as _Unread"
 msgstr "סימון כ_לא נקרא"
 
 #: src/client/conversation-list/conversation-list-view.vala:431
-#: ui/components-main-toolbar-menus.ui:17
+#: ui/components-menu-conversation.ui:17
 msgid "U_nstar"
 msgstr "ה_סרת כוכב"
 
 #: src/client/conversation-list/conversation-list-view.vala:438
-#: ui/components-main-toolbar-menus.ui:13
+#: ui/components-menu-conversation.ui:13
 msgid "_Star"
 msgstr "סימון ב_כוכב"
 
@@ -2129,6 +2134,10 @@ msgstr "פרטים"
 msgid "Geary requires your email password to continue"
 msgstr "‏Geary דורש את ססמת הדוא״ל שלך כדי להמשיך"
 
+#: src/client/folder-list/folder-list-account-branch.vala:53
+msgid "Folders"
+msgstr "תיקיות"
+
 #. Translators: Label displaying total number of email
 #. messages in a folder. String substitution is the actual
 #. number.
@@ -2784,7 +2793,7 @@ msgstr "ארכיון"
 #. Draft mailbox. Separate names using a vertical bar and
 #. put the most common localized name to the front for the
 #. default. English names do not need to be included.
-#: src/engine/imap-engine/imap-engine-generic-account.vala:1006
+#: src/engine/imap-engine/imap-engine-generic-account.vala:1015
 msgid "Drafts | Draft"
 msgstr "טיוטות | טיוטה | Drafts | Draft"
 
@@ -2792,13 +2801,13 @@ msgstr "טיוטות | טיוטה | Drafts | Draft"
 #. Sent mailbox. Separate names using a vertical bar and
 #. put the most common localized name to the front for the
 #. default. English names do not need to be included.
-#: src/engine/imap-engine/imap-engine-generic-account.vala:1015
+#: src/engine/imap-engine/imap-engine-generic-account.vala:1024
 msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
 msgstr "דואר יוצא | דואר נשלח | Sent | Sent Mail | Sent Email | Sent E-Mail"
 
 #. The localised name(s) of the Sent folder name as used
 #. by MS Outlook/Exchange.
-#: src/engine/imap-engine/imap-engine-generic-account.vala:1020
+#: src/engine/imap-engine/imap-engine-generic-account.vala:1029
 msgctxt "Outlook localised name"
 msgid "Sent Items"
 msgstr "דואר יוצא"
@@ -2807,7 +2816,7 @@ msgstr "דואר יוצא"
 #. Junk/Spam mailbox. Separate names using a vertical bar
 #. and put the most common localized name to the front for
 #. the default. English names do not need to be included.
-#: src/engine/imap-engine/imap-engine-generic-account.vala:1030
+#: src/engine/imap-engine/imap-engine-generic-account.vala:1039
 msgid ""
 "Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk Mail | Bulk Email "
 "| Bulk E-Mail"
@@ -2819,13 +2828,13 @@ msgstr ""
 #. Trash mailbox. Separate names using a vertical bar and
 #. put the most common localized name to the front for the
 #. default. English names do not need to be included.
-#: src/engine/imap-engine/imap-engine-generic-account.vala:1040
+#: src/engine/imap-engine/imap-engine-generic-account.vala:1049
 msgid "Trash | Rubbish | Rubbish Bin"
 msgstr "אשפה | זבל | Trash | Rubbish | Rubbish Bin"
 
 #. The localised name(s) of the Trash folder name as used
 #. by MS Outlook/Exchange.
-#: src/engine/imap-engine/imap-engine-generic-account.vala:1045
+#: src/engine/imap-engine/imap-engine-generic-account.vala:1054
 msgctxt "Outlook localised name"
 msgid "Deleted Items"
 msgstr "אשפה"
@@ -2834,7 +2843,7 @@ msgstr "אשפה"
 #. Archive mailbox. Separate names using a vertical bar
 #. and put the most common localized name to the front for
 #. the default. English names do not need to be included.
-#: src/engine/imap-engine/imap-engine-generic-account.vala:1055
+#: src/engine/imap-engine/imap-engine-generic-account.vala:1064
 msgid "Archive | Archives"
 msgstr "ארכיון | ארכיב | ארכיונים | ארכיבים | Archive | Archives"
 
@@ -3173,6 +3182,24 @@ msgstr "העברה"
 msgid "_Archive"
 msgstr "תיוק ב_ארכיון"
 
+#: ui/components-headerbar-conversation-list.ui:19
+#: ui/components-headerbar-conversation.ui:22
+msgid "Back"
+msgstr "אחורה"
+
+#: ui/components-headerbar-conversation-list.ui:36
+msgctxt "tooltip"
+msgid "Compose Message"
+msgstr "יצירת הודעה"
+
+#: ui/components-headerbar-conversation-list.ui:52
+msgid "Toggle search bar"
+msgstr "הצגת סרגל החיפוש"
+
+#: ui/components-headerbar-conversation.ui:59
+msgid "Toggle find bar"
+msgstr "הצגת סרגל החיפוש"
+
 #: ui/components-inspector-error-view.ui:27
 msgid ""
 "If the problem is serious or persists, please save and send these details to "
@@ -3222,39 +3249,22 @@ msgstr "העתקה ללוח הגזירים"
 msgid "Clears all log entries"
 msgstr "ניקוי כל רשומות היומן"
 
-#: ui/components-main-toolbar.ui:72 ui/components-main-toolbar.ui:158
-msgid "Back"
-msgstr "אחורה"
-
-#: ui/components-main-toolbar.ui:89
-msgctxt "tooltip"
-msgid "Compose Message"
-msgstr "יצירת הודעה"
-
-#: ui/components-main-toolbar.ui:105
-msgid "Toggle search bar"
-msgstr "הצגת סרגל החיפוש"
-
-#: ui/components-main-toolbar.ui:195
-msgid "Toggle find bar"
-msgstr "הצגת סרגל החיפוש"
-
-#: ui/components-main-toolbar-menus.ui:21
-msgid "Toggle as _Junk"
-msgstr "סימון/ביטול סימון כ_זבל"
-
-#: ui/components-main-toolbar-menus.ui:28
+#: ui/components-menu-application.ui:6
 msgid "_Accounts"
 msgstr "_חשבונות"
 
-#: ui/components-main-toolbar-menus.ui:36
+#: ui/components-menu-application.ui:14
 msgid "_Keyboard Shortcuts"
 msgstr "_צירופי מקשים"
 
-#: ui/components-main-toolbar-menus.ui:47
+#: ui/components-menu-application.ui:25
 msgid "_About Geary"
 msgstr "על _אודות Geary"
 
+#: ui/components-menu-conversation.ui:21
+msgid "Toggle as _Junk"
+msgstr "סימון/ביטול סימון כ_זבל"
+
 #: ui/conversation-contact-popover.ui:134
 msgid "New Conversation…"
 msgstr "תכתובת חדשה…"