diff --git a/po/ja.po b/po/ja.po
index c9ed1f34..a20957bb 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -13,7 +13,7 @@ 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: 2020-03-31 17:44+0000\n"
+"POT-Creation-Date: 2020-05-07 01:10+0000\n"
 "PO-Revision-Date: 2020-04-01 02:58+0900\n"
 "Last-Translator: sicklylife <translation@sicklylife.jp>\n"
 "Language-Team: Japanese (Japan) (https://l10n.gnome.org/module/geary/)\n"
@@ -610,12 +610,12 @@ msgid_plural "%d days back"
 msgstr[0] "%d日前"
 
 #: src/client/accounts/accounts-editor-list-pane.vala:255
-#: src/client/application/application-main-window.vala:2060
+#: src/client/application/application-main-window.vala:2027
 msgid "Undo"
 msgstr "元に戻す"
 
 #: src/client/accounts/accounts-editor-list-pane.vala:264
-#: src/client/application/application-main-window.vala:2043
+#: src/client/application/application-main-window.vala:2010
 msgid "Redo"
 msgstr "やり直す"
 
@@ -686,23 +686,23 @@ msgstr "サービスプロバイダー"
 #. Translators: This label describes what form of transport
 #. security (TLS, StartTLS, etc) used by an account's IMAP or SMTP
 #. service.
-#: src/client/accounts/accounts-editor-row.vala:468
+#: src/client/accounts/accounts-editor-row.vala:469
 msgid "Connection security"
 msgstr "接続のセキュリティ"
 
 #. Translators: Label used when no auth scheme is used
 #. by an account's IMAP or SMTP service.
-#: src/client/accounts/accounts-editor-row.vala:479
+#: src/client/accounts/accounts-editor-row.vala:480
 #: src/client/accounts/accounts-editor-servers-pane.vala:755
 #: src/client/accounts/accounts-editor-servers-pane.vala:970
 msgid "None"
 msgstr "なし"
 
-#: src/client/accounts/accounts-editor-row.vala:486
+#: src/client/accounts/accounts-editor-row.vala:487
 msgid "StartTLS"
 msgstr "StartTLS"
 
-#: src/client/accounts/accounts-editor-row.vala:493
+#: src/client/accounts/accounts-editor-row.vala:494
 msgid "TLS"
 msgstr "TLS"
 
@@ -710,7 +710,7 @@ msgstr "TLS"
 #. credentials (none, use IMAP, custom) when adding a new
 #. account
 #. Translators: An info bar button label
-#: src/client/accounts/accounts-editor-row.vala:534
+#: src/client/accounts/accounts-editor-row.vala:535
 #: src/client/application/application-main-window.vala:544
 msgid "Login"
 msgstr "ログイン"
@@ -718,21 +718,21 @@ msgstr "ログイン"
 #. Translators: ComboBox value for source of SMTP
 #. authentication credentials (none) when adding a new
 #. account
-#: src/client/accounts/accounts-editor-row.vala:541
+#: src/client/accounts/accounts-editor-row.vala:542
 msgid "No login needed"
 msgstr "ログイン不要"
 
 #. Translators: ComboBox value for source of SMTP
 #. authentication credentials (use IMAP) when adding a new
 #. account
-#: src/client/accounts/accounts-editor-row.vala:549
+#: src/client/accounts/accounts-editor-row.vala:550
 msgid "Use same login as receiving"
 msgstr "受信と同じ情報を使う"
 
 #. Translators: ComboBox value for source of SMTP
 #. authentication credentials (custom) when adding a new
 #. account
-#: src/client/accounts/accounts-editor-row.vala:557
+#: src/client/accounts/accounts-editor-row.vala:558
 msgid "Use a different login"
 msgstr "他の情報を使う"
 
@@ -820,137 +820,134 @@ msgid "Visit the Geary web site"
 msgstr "Geary のウェブサイト"
 
 #. / Command line option
-#: src/client/application/application-client.vala:97
+#: src/client/application/application-client.vala:96
 msgid "Print debug logging"
 msgstr "デバッグログを表示する"
 
 #. / Command line option
-#: src/client/application/application-client.vala:100
+#: src/client/application/application-client.vala:99
 msgid "Start with the main window hidden (deprecated)"
 msgstr "メインウィンドウを隠して起動する (非推奨)"
 
 #. / Command line option
-#: src/client/application/application-client.vala:103
+#: src/client/application/application-client.vala:102
 msgid "Enable WebKitGTK Inspector in web views"
 msgstr ""
 
 #. / Command line option
-#: src/client/application/application-client.vala:106
+#: src/client/application/application-client.vala:105
 msgid "Log conversation monitoring"
 msgstr "スレッドのモニタリングを記録する"
 
 #. / Command line option
-#: src/client/application/application-client.vala:109
+#: src/client/application/application-client.vala:108
 msgid "Log IMAP network deserialization"
 msgstr "IMAP ネットワークのデシリアライズを記録する"
 
 #. / Command line option. "Normalization" can also be called
 #. / "synchronization".
-#: src/client/application/application-client.vala:113
+#: src/client/application/application-client.vala:112
 msgid "Log folder normalization"
 msgstr "フォルダーの同期を記録する"
 
 #. / Command line option
-#: src/client/application/application-client.vala:116
-msgid "Log network activity"
+#: src/client/application/application-client.vala:115
+#, fuzzy
+#| msgid "Log network activity"
+msgid "Log IMAP network activity"
 msgstr "ネットワークのアクティビティを記録する"
 
-#. / Command line option
-#: src/client/application/application-client.vala:119
-msgid "Log periodic activity"
-msgstr "定期的なアクティビティを記録する"
-
 #. / Command line option. The IMAP replay queue is how changes
 #. / on the server are replicated on the client.  It could
 #. / also be called the IMAP events queue.
-#: src/client/application/application-client.vala:124
+#: src/client/application/application-client.vala:120
 msgid "Log IMAP replay queue"
 msgstr "IMAP のイベントキューを記録する"
 
-#. / Command line option. Serialization is how commands and
-#. / responses are converted into a stream of bytes for
-#. / network transmission
-#: src/client/application/application-client.vala:129
-msgid "Log IMAP network serialization"
-msgstr "IMAP ネットワークのストリームを記録する"
+#. / Command line option
+#: src/client/application/application-client.vala:123
+#, fuzzy
+#| msgid "Log network activity"
+msgid "Log SMTP network activity"
+msgstr "ネットワークのアクティビティを記録する"
 
 #. / Command line option
-#: src/client/application/application-client.vala:132
+#: src/client/application/application-client.vala:126
 msgid "Log database queries (generates lots of messages)"
 msgstr "データベースのクエリを記録する (多くのメッセージを生成します)"
 
 #. / Command line option
-#: src/client/application/application-client.vala:135
+#: src/client/application/application-client.vala:129
 msgid "Perform a graceful quit"
 msgstr "正常に終了する"
 
-#: src/client/application/application-client.vala:137
+#: src/client/application/application-client.vala:131
 msgid "Open a new window"
 msgstr "新しいウィンドウを開く"
 
 #. / Command line option
-#: src/client/application/application-client.vala:140
+#: src/client/application/application-client.vala:134
 msgid "Revoke all pinned TLS server certificates"
 msgstr "ピン留めされた TLS サーバー証明書をすべて失効させる"
 
 #. / Command line option
-#: src/client/application/application-client.vala:143
+#: src/client/application/application-client.vala:137
 msgid "Display program version"
 msgstr "プログラムのバージョンを表示する"
 
 #. / Application runtime information label
-#: src/client/application/application-client.vala:267
+#: src/client/application/application-client.vala:261
 msgid "Geary version"
 msgstr "Geary のバージョン"
 
 #. / Application runtime information label
-#: src/client/application/application-client.vala:269
+#: src/client/application/application-client.vala:263
 msgid "Geary revision"
 msgstr "Geary のリビジョン"
 
 #. / Application runtime information label
-#: src/client/application/application-client.vala:271
+#: src/client/application/application-client.vala:265
 msgid "GTK version"
 msgstr "GTK のバージョン"
 
 #. / Applciation runtime information label
-#: src/client/application/application-client.vala:278
+#: src/client/application/application-client.vala:272
 msgid "GLib version"
 msgstr "GLib のバージョン"
 
 #. / Application runtime information label
-#: src/client/application/application-client.vala:285
+#: src/client/application/application-client.vala:279
 msgid "WebKitGTK version"
 msgstr "WebKitGTK のバージョン"
 
 #. / Application runtime information label
-#: src/client/application/application-client.vala:292
+#: src/client/application/application-client.vala:286
 msgid "Desktop environment"
 msgstr "デスクトップ環境"
 
 #. Translators: This is the file type displayed for
 #. attachments with unknown file types.
-#: src/client/application/application-client.vala:294
+#: src/client/application/application-client.vala:288
 #: src/client/components/components-attachment-pane.vala:91
 msgid "Unknown"
 msgstr "不明"
 
 #. / Application runtime information label
-#: src/client/application/application-client.vala:324
+#: src/client/application/application-client.vala:318
 msgid "Distribution name"
 msgstr "ディストリビューション名"
 
 #. / Application runtime information label
-#: src/client/application/application-client.vala:329
+#: src/client/application/application-client.vala:323
 msgid "Distribution release"
 msgstr ""
 
 #. / Application runtime information label
-#: src/client/application/application-client.vala:337
+#: src/client/application/application-client.vala:331
 msgid "Installation prefix"
 msgstr ""
 
-#: src/client/application/application-client.vala:590
+#: src/client/application/application-client.vala:584
 #, c-format
 msgid "About %s"
 msgstr "%s について"
@@ -958,7 +955,7 @@ msgstr "%s について"
 #. Translators: add your name and email address to receive
 #. credit in the About dialog For example: Yamada Taro
 #. <yamada.taro@example.com>
-#: src/client/application/application-client.vala:594
+#: src/client/application/application-client.vala:588
 msgid "translator-credits"
 msgstr ""
 "masami chikahiro <cmasa.z321@gmail.com>\n"
@@ -969,36 +966,36 @@ msgstr ""
 
 #. / Warning printed to the console when a deprecated
 #. / command line option is used.
-#: src/client/application/application-client.vala:941
+#: src/client/application/application-client.vala:1049
 msgid "The `--hidden` option is deprecated and will be removed in the future."
 msgstr "`--hidden` オプションは非推奨です。将来的に削除されます。"
 
 #. / Command line warning, string substitution
 #. / is the given argument
-#: src/client/application/application-client.vala:974
+#: src/client/application/application-client.vala:1082
 #, c-format
 msgid "Unrecognised program argument: “%s”"
 msgstr "不明な引数です: “%s”"
 
 #. / Notification title.
-#: src/client/application/application-controller.vala:455
+#: src/client/application/application-controller.vala:485
 #, c-format
 msgid "A problem occurred sending email for %s"
 msgstr "%s のメール送信時に問題が発生しました"
 
 #. / Notification body
-#: src/client/application/application-controller.vala:459
+#: src/client/application/application-controller.vala:489
 msgid "Email will not be sent until re-connected"
 msgstr "再接続するまでメールを送信しません"
 
 #. / Translators: Label for in-app notification
-#: src/client/application/application-controller.vala:565
+#: src/client/application/application-controller.vala:588
 msgid "Conversation marked"
 msgid_plural "Conversations marked"
 msgstr[0] "スレッドをマークしました"
 
 #. / Translators: Label for in-app notification
-#: src/client/application/application-controller.vala:571
+#: src/client/application/application-controller.vala:594
 msgid "Conversation un-marked"
 msgid_plural "Conversations un-marked"
 msgstr[0] "スレッドのマークを外しました"
@@ -1006,8 +1003,8 @@ msgstr[0] "スレッドのマークを外しました"
 #. / Translators: Label for in-app
 #. / notification. String substitution is the name
 #. / of the destination folder.
-#: src/client/application/application-controller.vala:597
-#: src/client/application/application-controller.vala:681
+#: src/client/application/application-controller.vala:620
+#: src/client/application/application-controller.vala:704
 #, c-format
 msgid "Conversation moved to %s"
 msgid_plural "Conversations moved to %s"
@@ -1018,29 +1015,29 @@ msgstr[0] "スレッドを %s へ移動しました"
 #. / of the source folder.
 #. / Translators: Label for in-app notification. String
 #. / substitution is the name of the destination folder.
-#: src/client/application/application-controller.vala:605
-#: src/client/application/application-controller.vala:627
+#: src/client/application/application-controller.vala:628
+#: src/client/application/application-controller.vala:650
 #, c-format
 msgid "Conversation restored to %s"
 msgid_plural "Conversations restored to %s"
 msgstr[0] "スレッドを %s へ復元しました"
 
 #. / Translators: Label for in-app notification.
-#: src/client/application/application-controller.vala:648
+#: src/client/application/application-controller.vala:671
 msgid "Conversation archived"
 msgid_plural "Conversations archived"
 msgstr[0] "スレッドをアーカイブへ移動しました"
 
 #. / Translators: Label for in-app notification. String
 #. / substitution is the name of the destination folder.
-#: src/client/application/application-controller.vala:704
+#: src/client/application/application-controller.vala:727
 #, c-format
 msgid "Message restored to %s"
 msgid_plural "Messages restored to %s"
 msgstr[0] "メッセージを %s へ復元しました"
 
 #. / Translators: Label for in-app notification.
-#: src/client/application/application-controller.vala:725
+#: src/client/application/application-controller.vala:748
 msgid "Message archived"
 msgid_plural "Messages archived"
 msgstr[0] "メッセージをアーカイブへ移動しました"
@@ -1048,7 +1045,7 @@ msgstr[0] "メッセージをアーカイブへ移動しました"
 #. / Translators: Label for in-app
 #. / notification. String substitution is the name
 #. / of the destination folder.
-#: src/client/application/application-controller.vala:760
+#: src/client/application/application-controller.vala:783
 #, c-format
 msgid "Message moved to %s"
 msgid_plural "Messages moved to %s"
@@ -1057,7 +1054,7 @@ msgstr[0] "メッセージを %s へ移動しました"
 #. / Translators: Label for in-app
 #. / notification. String substitution is the name
 #. / of the destination folder.
-#: src/client/application/application-controller.vala:788
+#: src/client/application/application-controller.vala:811
 #, c-format
 msgid "Conversation labelled as %s"
 msgid_plural "Conversations labelled as %s"
@@ -1066,18 +1063,18 @@ msgstr[0] "スレッドを %s としてラベル付けしました"
 #. / Translators: Label for in-app
 #. / notification. String substitution is the name
 #. / of the destination folder.
-#: src/client/application/application-controller.vala:796
+#: src/client/application/application-controller.vala:819
 #, c-format
 msgid "Conversation un-labelled as %s"
 msgid_plural "Conversations un-labelled as %s"
 msgstr[0] "スレッドのラベル %s を外しました"
 
-#: src/client/application/application-controller.vala:1215
+#: src/client/application/application-controller.vala:1305
 #, c-format
 msgid "Unable to open the database for %s"
 msgstr "%s のデータベースを開けません"
 
-#: src/client/application/application-controller.vala:1216
+#: src/client/application/application-controller.vala:1306
 #, c-format
 msgid ""
 "There was an error opening the local mail database for this account. This is "
@@ -1101,20 +1098,20 @@ msgstr ""
 "データベースを再構築すると、すべてのローカルメールと添付ファイルが破棄されま"
 "す。<b>サーバー上のメールは影響を受けません。</b>"
 
-#: src/client/application/application-controller.vala:1218
+#: src/client/application/application-controller.vala:1308
 msgid "_Rebuild"
 msgstr "再構築(_R)"
 
-#: src/client/application/application-controller.vala:1218
+#: src/client/application/application-controller.vala:1308
 msgid "E_xit"
 msgstr "終了(_X)"
 
-#: src/client/application/application-controller.vala:1228
+#: src/client/application/application-controller.vala:1318
 #, c-format
 msgid "Unable to rebuild database for “%s”"
 msgstr "“%s”のデータベースを再構築できません"
 
-#: src/client/application/application-controller.vala:1229
+#: src/client/application/application-controller.vala:1319
 #, c-format
 msgid ""
 "Error during rebuild:\n"
@@ -1127,34 +1124,34 @@ 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:1468
+#: src/client/application/application-controller.vala:1449
 #, c-format
 msgid "Email sent to %s"
 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:2564
+#: src/client/application/application-controller.vala:2448
 #, 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:2628
+#: src/client/application/application-controller.vala:2512
 #, c-format
 msgid "Email to %s saved"
 msgstr "%s へのメールを保存しました"
 
 #. / Translators: A label for an in-app notification.
-#: src/client/application/application-controller.vala:2643
-#: src/client/application/application-controller.vala:2701
+#: src/client/application/application-controller.vala:2527
+#: src/client/application/application-controller.vala:2585
 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:2686
+#: src/client/application/application-controller.vala:2570
 #, c-format
 msgid "Email to %s discarded"
 msgstr "%s へのメールを破棄しました"
@@ -1212,46 +1209,50 @@ msgstr "接続のセキュリティに関する詳細を確認"
 msgid "%s — %s"
 msgstr "%s — %s"
 
-#: src/client/application/application-main-window.vala:991
+#. 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:972
+#: src/client/folder-list/folder-list-account-branch.vala:43
 msgid "Labels"
 msgstr "ラベル"
 
-#: src/client/application/application-main-window.vala:1290
+#: src/client/application/application-main-window.vala:1261
 #, c-format
 msgid "Empty all email from your %s folder?"
 msgstr "%s フォルダーのすべてのメールを空にしますか?"
 
-#: src/client/application/application-main-window.vala:1291
+#: src/client/application/application-main-window.vala:1262
 msgid "This removes the email from Geary and your email server."
 msgstr "メールを Geary とメールサーバーから削除します。"
 
-#: src/client/application/application-main-window.vala:1292
+#: src/client/application/application-main-window.vala:1263
 msgid "This cannot be undone."
 msgstr "これは元に戻すことができません。"
 
-#: src/client/application/application-main-window.vala:1293
+#: src/client/application/application-main-window.vala:1264
 #, c-format
 msgid "Empty %s"
 msgstr "%s を空にする"
 
 #. / Translators: Primary text for a confirmation dialog
-#: src/client/application/application-main-window.vala:1350
+#: src/client/application/application-main-window.vala:1321
 msgid "Do you want to permanently delete this conversation?"
 msgid_plural "Do you want to permanently delete these conversations?"
 msgstr[0] "このスレッドを完全に削除しますか?"
 
-#: src/client/application/application-main-window.vala:1355
-#: src/client/application/application-main-window.vala:1370
+#: src/client/application/application-main-window.vala:1326
+#: src/client/application/application-main-window.vala:1341
 msgid "Delete"
 msgstr "削除"
 
 #. / Translators: Primary text for a confirmation dialog
-#: src/client/application/application-main-window.vala:1365
+#: src/client/application/application-main-window.vala:1336
 msgid "Do you want to permanently delete this message?"
 msgid_plural "Do you want to permanently delete these messages?"
 msgstr[0] "このメッセージを完全に削除しますか?"
 
-#: src/client/application/application-main-window.vala:1698
+#: src/client/application/application-main-window.vala:1659
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
@@ -1262,7 +1263,7 @@ msgstr "%s (%d)"
 #. Document (100.9MB)
 #. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
 #: src/client/components/components-attachment-pane.vala:107
-#: src/client/composer/composer-widget.vala:1839
+#: src/client/composer/composer-widget.vala:1918
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
@@ -1283,13 +1284,13 @@ msgstr ""
 msgid "Don’t _ask me again"
 msgstr "次回から表示しない(_A)"
 
-#: src/client/components/components-inspector.vala:72
+#: src/client/components/components-inspector.vala:78
 msgid "Inspector"
 msgstr ""
 
 #. / Translators: Title for Inspector logs pane
 #. / Translators: Title for problem report dialog logs pane
-#: src/client/components/components-inspector.vala:87
+#: src/client/components/components-inspector.vala:93
 #: src/client/dialogs/dialogs-problem-details-dialog.vala:102
 msgid "Logs"
 msgstr "ログ"
@@ -1297,21 +1298,21 @@ msgstr "ログ"
 #. / Translators: Title for Inspector system system information pane
 #. / Translators: Title for problem report system information
 #. / pane
-#: src/client/components/components-inspector.vala:91
+#: src/client/components/components-inspector.vala:97
 #: src/client/dialogs/dialogs-problem-details-dialog.vala:105
 msgid "System"
 msgstr "システム"
 
 #. Button label for saving problem report information
-#: src/client/components/components-inspector.vala:208
-#: src/client/components/components-inspector.vala:211
+#: src/client/components/components-inspector.vala:226
+#: src/client/components/components-inspector.vala:229
 #: src/client/dialogs/dialogs-problem-details-dialog.vala:221
 #: src/client/dialogs/dialogs-problem-details-dialog.vala:224
 #: ui/problem-details-dialog.ui:42
 msgid "Save As"
 msgstr "名前を付けて保存"
 
-#: src/client/components/components-inspector.vala:212
+#: src/client/components/components-inspector.vala:230
 #: src/client/dialogs/dialogs-problem-details-dialog.vala:225
 #: ui/accounts_editor_servers_pane.ui:17
 msgid "Cancel"
@@ -1360,7 +1361,7 @@ msgid "Preferences"
 msgstr "設定"
 
 #. / Translators: Preferences page title
-#: src/client/components/components-preferences-window.vala:179
+#: src/client/components/components-preferences-window.vala:180
 msgid "Plugins"
 msgstr "プラグイン"
 
@@ -1596,23 +1597,23 @@ msgid "Invalid email address"
 msgstr "無効なメールアドレス"
 
 #. / Translators: Title for an empty composer window
-#: src/client/composer/composer-widget.vala:30
+#: src/client/composer/composer-widget.vala:31
 msgid "New Message"
 msgstr "新規メッセージ"
 
-#: src/client/composer/composer-widget.vala:217
+#: src/client/composer/composer-widget.vala:235
 msgid "Saved"
 msgstr "保存済み"
 
-#: src/client/composer/composer-widget.vala:218
+#: src/client/composer/composer-widget.vala:236
 msgid "Saving"
 msgstr "保存中"
 
-#: src/client/composer/composer-widget.vala:219
+#: src/client/composer/composer-widget.vala:237
 msgid "Error saving"
 msgstr "保存エラー"
 
-#: src/client/composer/composer-widget.vala:220
+#: src/client/composer/composer-widget.vala:238
 msgid "Press Backspace to delete quote"
 msgstr "Backspace を押すと引用を削除できます"
 
@@ -1621,7 +1622,7 @@ msgstr "Backspace を押すと引用を削除できます"
 #. checking, include all variants of each word. No spaces are
 #. allowed. The words will be converted to lower case based on
 #. locale and English versions included automatically.
-#: src/client/composer/composer-widget.vala:236
+#: src/client/composer/composer-widget.vala:254
 msgid ""
 "attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|"
 "enclosing|encloses|enclosure|enclosures"
@@ -1630,90 +1631,90 @@ msgstr ""
 #. Translators: This dialog text is displayed to the
 #. user when closing a composer where the options are
 #. Keep, Discard or Cancel.
-#: src/client/composer/composer-widget.vala:843
+#: src/client/composer/composer-widget.vala:903
 msgid "Do you want to keep or discard this draft message?"
 msgstr "この下書きメッセージを保持または破棄しますか?"
 
 #. Translators: This dialog text is displayed to the
 #. user when closing a composer where the options are
 #. only Discard or Cancel.
-#: src/client/composer/composer-widget.vala:869
+#: src/client/composer/composer-widget.vala:929
 msgid "Do you want to discard this draft message?"
 msgstr "この下書きメッセージを破棄しますか?"
 
-#: src/client/composer/composer-widget.vala:1508
+#: src/client/composer/composer-widget.vala:1575
 msgid "Send message with an empty subject and body?"
 msgstr "メッセージを件名と本文なしで送信しますか?"
 
-#: src/client/composer/composer-widget.vala:1510
+#: src/client/composer/composer-widget.vala:1577
 msgid "Send message with an empty subject?"
 msgstr "メッセージを件名なしで送信しますか?"
 
-#: src/client/composer/composer-widget.vala:1512
+#: src/client/composer/composer-widget.vala:1579
 msgid "Send message with an empty body?"
 msgstr "メッセージを本文なしで送信しますか?"
 
-#: src/client/composer/composer-widget.vala:1521
+#: src/client/composer/composer-widget.vala:1588
 msgid "Send message without an attachment?"
 msgstr "メッセージを添付ファイルなしで送信しますか?"
 
-#: src/client/composer/composer-widget.vala:1825
+#: src/client/composer/composer-widget.vala:1904
 #, c-format
 msgid "“%s” already attached for delivery."
 msgstr "“%s”はすでに添付されています。"
 
-#: src/client/composer/composer-widget.vala:1861
-#: src/client/composer/composer-widget.vala:1911
+#: src/client/composer/composer-widget.vala:1940
+#: src/client/composer/composer-widget.vala:1990
 #, c-format
 msgid "“%s” is an empty file."
 msgstr "“%s”は空ファイルです。"
 
-#: src/client/composer/composer-widget.vala:1899
+#: src/client/composer/composer-widget.vala:1978
 #, c-format
 msgid "“%s” could not be found."
 msgstr "“%s”が見つかりませんでした。"
 
-#: src/client/composer/composer-widget.vala:1905
+#: src/client/composer/composer-widget.vala:1984
 #, c-format
 msgid "“%s” is a folder."
 msgstr "“%s”はフォルダーです。"
 
-#: src/client/composer/composer-widget.vala:1924
+#: src/client/composer/composer-widget.vala:2003
 #, c-format
 msgid "“%s” could not be opened for reading."
 msgstr "“%s”を読み取り用に開けませんでした。"
 
-#: src/client/composer/composer-widget.vala:1932
+#: src/client/composer/composer-widget.vala:2011
 msgid "Cannot add attachment"
 msgstr "添付できません"
 
 #. Translators: Human-readable version of the RFC 822 To header
-#: src/client/composer/composer-widget.vala:1989
+#: src/client/composer/composer-widget.vala:2071
 #: src/client/conversation-viewer/conversation-email.vala:542
-#: src/client/util/util-email.vala:235 ui/conversation-message.ui:312
+#: src/client/util/util-email.vala:236 ui/conversation-message.ui:312
 msgid "To:"
 msgstr "宛先:"
 
 #. Translators: Human-readable version of the RFC 822 CC header
-#: src/client/composer/composer-widget.vala:1995
+#: src/client/composer/composer-widget.vala:2077
 #: src/client/conversation-viewer/conversation-email.vala:547
-#: src/client/util/util-email.vala:240 ui/conversation-message.ui:357
+#: src/client/util/util-email.vala:241 ui/conversation-message.ui:357
 msgid "Cc:"
 msgstr "Cc:"
 
 #. Translators: Human-readable version of the RFC 822 BCC header
-#: src/client/composer/composer-widget.vala:2001
+#: src/client/composer/composer-widget.vala:2083
 #: src/client/conversation-viewer/conversation-email.vala:552
 #: ui/conversation-message.ui:402
 msgid "Bcc:"
 msgstr "Bcc:"
 
 #. Translators: Human-readable version of the RFC 822 Reply-To header
-#: src/client/composer/composer-widget.vala:2007
+#: src/client/composer/composer-widget.vala:2089
 msgid "Reply-To: "
 msgstr "Reply-To: "
 
-#: src/client/composer/composer-widget.vala:2259
+#: src/client/composer/composer-widget.vala:2341
 msgid "Select Color"
 msgstr "色を選択"
 
@@ -1722,14 +1723,14 @@ msgstr "色を選択"
 #. printf argument will be the alternate email address,
 #. and the second will be the account's primary email
 #. address.
-#: src/client/composer/composer-widget.vala:2445
+#: src/client/composer/composer-widget.vala:2530
 #, c-format
 msgid "%1$s via %2$s"
 msgstr "%1$s (%2$s を通して使用)"
 
 #. Translators: This is the name of the file chooser filter
 #. when inserting an image in the composer.
-#: src/client/composer/composer-widget.vala:2802
+#: src/client/composer/composer-widget.vala:2887
 msgid "Images"
 msgstr "画像"
 
@@ -1799,19 +1800,19 @@ msgstr "自分"
 
 #. Translators: Human-readable version of the RFC 822 From header
 #: src/client/conversation-viewer/conversation-email.vala:537
-#: src/client/util/util-email.vala:226
+#: src/client/util/util-email.vala:227
 msgid "From:"
 msgstr "差出人:"
 
 #. Translators: Human-readable version of the RFC 822 Date header
 #: src/client/conversation-viewer/conversation-email.vala:557
-#: src/client/util/util-email.vala:231
+#: src/client/util/util-email.vala:232
 msgid "Date:"
 msgstr "日時:"
 
 #. Translators: Human-readable version of the RFC 822 Subject header
 #: src/client/conversation-viewer/conversation-email.vala:567
-#: src/client/util/util-email.vala:229
+#: src/client/util/util-email.vala:230
 msgid "Subject:"
 msgstr "件名:"
 
@@ -1857,22 +1858,22 @@ msgid "Image"
 msgstr "画像"
 
 #. Translators: Info bar status message
-#: src/client/conversation-viewer/conversation-message.vala:1304
+#: src/client/conversation-viewer/conversation-message.vala:1305
 msgid "Remote images not shown"
 msgstr "リモート画像は表示しません"
 
 #. Translators: Info bar description
-#: src/client/conversation-viewer/conversation-message.vala:1306
+#: src/client/conversation-viewer/conversation-message.vala:1307
 msgid "Only show remote images from senders you trust."
 msgstr "信頼できる送信者のリモート画像のみ表示するようにしてください。"
 
 #. Translators: Info bar button label
-#: src/client/conversation-viewer/conversation-message.vala:1310
+#: src/client/conversation-viewer/conversation-message.vala:1311
 msgid "Show"
 msgstr "表示"
 
 #. Translators: Info bar button label
-#: src/client/conversation-viewer/conversation-message.vala:1314
+#: src/client/conversation-viewer/conversation-message.vala:1315
 msgid "Always show from sender"
 msgstr "この送信者のものは常に表示"
 
@@ -2018,24 +2019,30 @@ msgstr "詳細"
 msgid "Geary requires your email password to continue"
 msgstr "続けるにはメールのパスワードが必要です"
 
-#. Label displaying total number of email messages in a folder
-#: src/client/folder-list/folder-list-folder-entry.vala:30
+#. Translators: Label displaying total number of email
+#. messages in a folder. String substitution is the actual
+#. number.
+#: src/client/folder-list/folder-list-folder-entry.vala:42
 #, c-format
 msgid "%d message"
 msgid_plural "%d messages"
 msgstr[0] "%d 件のメッセージ"
 
-#. / Label displaying number of unread email messages in a folder
-#: src/client/folder-list/folder-list-folder-entry.vala:37
+#. Translators: Label displaying number of unread email
+#. messages in a folder. String substitution is the actual
+#. number.
+#: src/client/folder-list/folder-list-folder-entry.vala:52
 #, c-format
 msgid "%d unread"
 msgid_plural "%d unread"
 msgstr[0] "%d 件の未読"
 
-#. / This string represents the divider between two messages: "n messages" and "n unread",
-#. / shown in the folder list as a tooltip.  Please use your languages conventions for
-#. / combining the two, i.e. a comma (",") for English; "6 messages, 3 unread"
-#: src/client/folder-list/folder-list-folder-entry.vala:43
+#. Translators: This string represents the divider between two
+#. messages: "n messages" and "n unread", shown in the folder
+#. list as a tooltip.  Please use your languages conventions
+#. for combining the two, i.e. a comma (",") for English; "6
+#. messages, 3 unread"
+#: src/client/folder-list/folder-list-folder-entry.vala:60
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
@@ -2099,11 +2106,70 @@ msgstr[0] "%s, 合計 %d 件の新着メッセージ"
 
 #. / Notification title when new messages have been
 #. / received
-#: src/client/plugin/desktop-notifications/desktop-notifications.vala:284
+#: src/client/plugin/desktop-notifications/desktop-notifications.vala:282
 msgid "New message"
 msgid_plural "New messages"
 msgstr[0] "新着メッセージ"
 
+#: src/client/plugin/email-templates/email-templates.plugin.desktop.in:4
+#, fuzzy
+#| msgid "Email address"
+msgid "Email Templates"
+msgstr "メールアドレス"
+
+#: src/client/plugin/email-templates/email-templates.plugin.desktop.in:5
+msgid "Create reusable templates for sending email"
+msgstr ""
+
+#. Translators: Templates folder name alternatives. 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/client/plugin/email-templates/email-templates.vala:29
+#, fuzzy
+#| msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
+msgid "Templates | Template Mail | Template Email | Template E-Mail"
+msgstr "送信済み | 送信 | 送信メール | 送信済みメール | 送信済メール"
+
+#. Translators: The name of the folder used to
+#. store email templates
+#: src/client/plugin/email-templates/email-templates.vala:195
+msgid "Templates"
+msgstr ""
+
+#. Translators: Info bar button label for creating a
+#. new email template
+#: src/client/plugin/email-templates/email-templates.vala:276
+#, fuzzy
+#| msgid "Now"
+msgid "New"
+msgstr "今"
+
+#. Translators: Infobar status label for an email template
+#: src/client/plugin/email-templates/email-templates.vala:287
+#, fuzzy
+#| msgid "Message not saved"
+msgid "Message template"
+msgstr "メッセージが保存されませんでした"
+
+#. Translators: Info bar button label for sending an
+#. email template
+#: src/client/plugin/email-templates/email-templates.vala:291
+#, fuzzy
+#| msgctxt "shortcut window"
+#| msgid "Send"
+msgid "Send"
+msgstr "送信する"
+
+#. Translators: Info bar button label for editing an
+#. existing email template
+#. Translators: Info bar button label for editing a draft
+#. email
+#: src/client/plugin/email-templates/email-templates.vala:299
+#: src/client/plugin/special-folders/special-folders.vala:180
+msgid "Edit"
+msgstr "編集"
+
 #: src/client/plugin/folder-highlight/folder-highlight.plugin.desktop.in:4
 msgid "Folder Highlight"
 msgstr "フォルダーのハイライト"
@@ -2147,36 +2213,30 @@ msgstr ""
 
 #. Translators: Info bar button label for emptying
 #. trash/spam folders
-#: src/client/plugin/special-folders/special-folders.vala:140
+#: src/client/plugin/special-folders/special-folders.vala:160
 msgid "Empty"
 msgstr "空にする"
 
 #. Translators: Info bar status message for a draft email
-#: src/client/plugin/special-folders/special-folders.vala:152
+#: src/client/plugin/special-folders/special-folders.vala:172
 msgid "Draft message"
 msgstr "下書きメッセージ"
 
 #. Translators: Info bar status description for a draft
 #. email
-#: src/client/plugin/special-folders/special-folders.vala:155
+#: src/client/plugin/special-folders/special-folders.vala:175
 msgid "This message has not yet been sent."
 msgstr "このメッセージはまだ送信していません。"
 
-#. Translators: Info bar button label for editing a draft
-#. email
-#: src/client/plugin/special-folders/special-folders.vala:160
-msgid "Edit"
-msgstr "編集"
-
 #. Translators: Info bar status message for an sent but
 #. unsaved email
-#: src/client/plugin/special-folders/special-folders.vala:171
+#: src/client/plugin/special-folders/special-folders.vala:191
 msgid "Message not saved"
 msgstr "メッセージが保存されませんでした"
 
 #. Translators: Info bar status description for a sent but
 #. unsaved email
-#: src/client/plugin/special-folders/special-folders.vala:174
+#: src/client/plugin/special-folders/special-folders.vala:194
 msgid "This message was sent, but has not been saved to your account."
 msgstr ""
 "このメッセージを送信しましたが、お使いのアカウントに保存されませんでした。"
@@ -2272,7 +2332,7 @@ msgstr "(件名なし)"
 #. / Translators: This is shown for displaying a list of email
 #. / recipients that happens to be empty, i.e. contains no
 #. / email addresses.
-#: src/client/util/util-email.vala:134
+#: src/client/util/util-email.vala:135
 msgid "(No recipients)"
 msgstr "(受信者なし)"
 
@@ -2281,7 +2341,7 @@ msgstr "(受信者なし)"
 #. / addresses. The first (string) substitution is
 #. / address of the first, the second substitution is
 #. / the number of n - 1 remaining recipients.
-#: src/client/util/util-email.vala:146
+#: src/client/util/util-email.vala:147
 #, c-format
 msgid "%s and %d other"
 msgid_plural "%s and %d others"
@@ -2290,26 +2350,26 @@ msgstr[0] "%s とその他 %d 人"
 #. / The quoted header for a message being replied to.
 #. / %1$s will be substituted for the date, and %2$s will be substituted for
 #. / the original sender.
-#: src/client/util/util-email.vala:179
+#: src/client/util/util-email.vala:180
 #, c-format
 msgid "On %1$s, %2$s wrote:"
 msgstr ""
 
 #. / The quoted header for a message being replied to (in case the date is not known).
 #. / %s will be replaced by the original sender.
-#: src/client/util/util-email.vala:186
+#: src/client/util/util-email.vala:187
 #, c-format
 msgid "%s wrote:"
 msgstr ""
 
 #. / The quoted header for a message being replied to (in case the sender is not known).
 #. / %s will be replaced by the original date
-#: src/client/util/util-email.vala:192
+#: src/client/util/util-email.vala:193
 #, c-format
 msgid "On %s:"
 msgstr ""
 
-#: src/client/util/util-email.vala:221
+#: src/client/util/util-email.vala:222
 msgid "---------- Forwarded message ----------"
 msgstr ""
 
@@ -2549,7 +2609,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:884
+#: src/engine/imap-engine/imap-engine-generic-account.vala:892
 msgid "Drafts | Draft"
 msgstr "下書き"
 
@@ -2557,13 +2617,13 @@ msgstr "下書き"
 #. 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:893
+#: src/engine/imap-engine/imap-engine-generic-account.vala:901
 msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
 msgstr "送信済み | 送信 | 送信メール | 送信済みメール | 送信済メール"
 
 #. The localised name(s) of the Sent folder name as used
 #. by MS Outlook/Exchange.
-#: src/engine/imap-engine/imap-engine-generic-account.vala:898
+#: src/engine/imap-engine/imap-engine-generic-account.vala:906
 msgctxt "Outlook localised name"
 msgid "Sent Items"
 msgstr "送信したアイテム"
@@ -2572,7 +2632,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:908
+#: src/engine/imap-engine/imap-engine-generic-account.vala:916
 msgid ""
 "Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk Mail | Bulk Email "
 "| Bulk E-Mail"
@@ -2582,13 +2642,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:918
+#: src/engine/imap-engine/imap-engine-generic-account.vala:926
 msgid "Trash | Rubbish | Rubbish Bin"
 msgstr "ごみ箱 | ゴミ箱"
 
 #. The localised name(s) of the Trash folder name as used
 #. by MS Outlook/Exchange.
-#: src/engine/imap-engine/imap-engine-generic-account.vala:923
+#: src/engine/imap-engine/imap-engine-generic-account.vala:931
 msgctxt "Outlook localised name"
 msgid "Deleted Items"
 msgstr "削除したアイテム"
@@ -2597,7 +2657,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:933
+#: src/engine/imap-engine/imap-engine-generic-account.vala:941
 msgid "Archive | Archives"
 msgstr "アーカイブ"
 
@@ -2620,14 +2680,16 @@ msgid "Add an account"
 msgstr "アカウントを追加"
 
 #: ui/accounts_editor_add_pane.ui:53
-msgid "Create"
+#, fuzzy
+#| msgid "Create"
+msgid "_Create"
 msgstr "作成"
 
-#: ui/accounts_editor_add_pane.ui:130 ui/accounts_editor_servers_pane.ui:125
+#: ui/accounts_editor_add_pane.ui:131 ui/accounts_editor_servers_pane.ui:125
 msgid "Receiving"
 msgstr "受信"
 
-#: ui/accounts_editor_add_pane.ui:178 ui/accounts_editor_servers_pane.ui:165
+#: ui/accounts_editor_add_pane.ui:179 ui/accounts_editor_servers_pane.ui:165
 msgid "Sending"
 msgstr "送信"
 
@@ -2989,29 +3051,41 @@ msgstr ""
 msgid "Details:"
 msgstr "詳細:"
 
-#. Tooltip for inspector button
-#: ui/components-inspector.ui:20
-msgid "Toggle appending new log entries"
-msgstr ""
-
 #. Tooltip for inspector button
 #. Tooltip for problem report button
-#: ui/components-inspector.ui:37 ui/problem-details-dialog.ui:19
+#: ui/components-inspector.ui:19 ui/problem-details-dialog.ui:19
 msgid "Search for matching log entries"
 msgstr "一致するログエントリーを検索"
 
+#. Tooltip for inspector button
+#: ui/components-inspector.ui:35
+msgid "Toggle appending new log entries"
+msgstr ""
+
+#. Tooltip for inspector button
+#: ui/components-inspector.ui:55
+msgid "Add a marker entry to the log"
+msgstr ""
+
 #. Tooltip for inspector button
 #. Tooltip for problem report button
-#: ui/components-inspector.ui:63 ui/problem-details-dialog.ui:46
+#: ui/components-inspector.ui:81 ui/problem-details-dialog.ui:46
 msgid "Save logs entries and details"
 msgstr "ログエントリーと詳細を保存"
 
 #. Tooltip for inspector button
 #. Tooltip for problem report button
-#: ui/components-inspector.ui:84 ui/problem-details-dialog.ui:62
+#: ui/components-inspector.ui:101 ui/problem-details-dialog.ui:62
 msgid "Copy to clipboard"
 msgstr "クリップボードにコピー"
 
+#. Tooltip for inspector button
+#: ui/components-inspector.ui:121
+#, fuzzy
+#| msgid "Search for matching log entries"
+msgid "Clears all log entries"
+msgstr "一致するログエントリーを検索"
+
 #: ui/conversation-contact-popover.ui:146
 msgid "New Conversation…"
 msgstr "新しいスレッド…"
@@ -3212,7 +3286,7 @@ msgstr "ラベル"
 msgid "Conversation Shortcuts"
 msgstr "スレッドのショートカット"
 
-#: ui/gtk/help-overlay.ui:13 ui/gtk/help-overlay.ui:355
+#: ui/gtk/help-overlay.ui:13 ui/gtk/help-overlay.ui:377
 msgctxt "shortcut window"
 msgid "Actions"
 msgstr "アクション"
@@ -3227,37 +3301,37 @@ msgctxt "shortcut window"
 msgid "Reply to sender"
 msgstr "送信者に返信する"
 
-#: ui/gtk/help-overlay.ui:31 ui/gtk/help-overlay.ui:269
+#: ui/gtk/help-overlay.ui:31 ui/gtk/help-overlay.ui:281
 msgctxt "shortcut window"
 msgid "Reply to all"
 msgstr "全員に返信する"
 
-#: ui/gtk/help-overlay.ui:38 ui/gtk/help-overlay.ui:276
+#: ui/gtk/help-overlay.ui:38 ui/gtk/help-overlay.ui:288
 msgctxt "shortcut window"
 msgid "Forward"
 msgstr "転送する"
 
-#: ui/gtk/help-overlay.ui:45 ui/gtk/help-overlay.ui:283
+#: ui/gtk/help-overlay.ui:45 ui/gtk/help-overlay.ui:295
 msgctxt "shortcut window"
 msgid "Un-mark/mark read"
 msgstr "既読マークを付ける/外す"
 
-#: ui/gtk/help-overlay.ui:52 ui/gtk/help-overlay.ui:290
+#: ui/gtk/help-overlay.ui:52 ui/gtk/help-overlay.ui:302
 msgctxt "shortcut window"
 msgid "Mark/un-mark starred"
 msgstr "星を付ける/外す"
 
-#: ui/gtk/help-overlay.ui:59 ui/gtk/help-overlay.ui:297
+#: ui/gtk/help-overlay.ui:59 ui/gtk/help-overlay.ui:309
 msgctxt "shortcut window"
 msgid "Archive conversations"
 msgstr "スレッドをアーカイブへ移動する"
 
-#: ui/gtk/help-overlay.ui:66 ui/gtk/help-overlay.ui:304
+#: ui/gtk/help-overlay.ui:66 ui/gtk/help-overlay.ui:326
 msgctxt "shortcut window"
 msgid "Move conversations"
 msgstr "スレッドを移動する"
 
-#: ui/gtk/help-overlay.ui:73 ui/gtk/help-overlay.ui:311
+#: ui/gtk/help-overlay.ui:73 ui/gtk/help-overlay.ui:333
 msgctxt "shortcut window"
 msgid "Label conversations"
 msgstr "スレッドにラベルを付ける"
@@ -3267,12 +3341,12 @@ msgctxt "shortcut window"
 msgid "Trash conversations"
 msgstr "スレッドをゴミ箱へ移動する"
 
-#: ui/gtk/help-overlay.ui:87 ui/gtk/help-overlay.ui:318
+#: ui/gtk/help-overlay.ui:87 ui/gtk/help-overlay.ui:340
 msgctxt "shortcut window"
 msgid "Junk conversations"
 msgstr "スレッドを迷惑メールへ移動する"
 
-#: ui/gtk/help-overlay.ui:95 ui/gtk/help-overlay.ui:325
+#: ui/gtk/help-overlay.ui:95 ui/gtk/help-overlay.ui:347
 msgctxt "shortcut window"
 msgid "Delete conversations"
 msgstr "スレッドを削除する"
@@ -3287,7 +3361,7 @@ msgctxt "shortcut window"
 msgid "Search for conversations"
 msgstr "スレッドを検索する"
 
-#: ui/gtk/help-overlay.ui:115
+#: ui/gtk/help-overlay.ui:115 ui/gtk/help-overlay.ui:354
 msgctxt "shortcut window"
 msgid "Find in current conversation"
 msgstr "現在のスレッド内を検索する"
@@ -3327,7 +3401,7 @@ msgctxt "shortcut window"
 msgid "Reset zoom"
 msgstr "拡大/縮小をリセットする"
 
-#: ui/gtk/help-overlay.ui:188 ui/gtk/help-overlay.ui:375
+#: ui/gtk/help-overlay.ui:188 ui/gtk/help-overlay.ui:397
 msgctxt "shortcut window"
 msgid "General"
 msgstr "全般"
@@ -3377,121 +3451,126 @@ msgctxt "shortcut window"
 msgid "Focus next/previous message"
 msgstr "フォーカスを次/前のメッセージに移動する"
 
-#: ui/gtk/help-overlay.ui:258
-msgctxt "shortcut window"
-msgid "Single-key shortcuts"
+#: ui/gtk/help-overlay.ui:260
+#, fuzzy
+#| msgctxt "shortcut window"
+#| msgid "Single-key shortcuts"
+msgid "Single-key Shortcuts"
 msgstr "シングルキーショートカット"
 
-#: ui/gtk/help-overlay.ui:262
+#: ui/gtk/help-overlay.ui:265
+#, fuzzy
+#| msgctxt "shortcut window"
+#| msgid "Single-key shortcuts"
+msgctxt "shortcut window"
+msgid "Single-key shortcuts (if enabled)"
+msgstr "シングルキーショートカット"
+
+#: ui/gtk/help-overlay.ui:274
 msgctxt "shortcut window"
 msgid "Reply to sender "
 msgstr "送信者に返信する "
 
-#: ui/gtk/help-overlay.ui:332
-msgctxt "shortcut window"
-msgid "Find in current conversations"
-msgstr "現在のスレッド内を検索する"
-
-#: ui/gtk/help-overlay.ui:339
+#: ui/gtk/help-overlay.ui:361
 msgctxt "shortcut window"
 msgid "Select next/previous conversations"
 msgstr "次/前のスレッドを選択する"
 
-#: ui/gtk/help-overlay.ui:351
+#: ui/gtk/help-overlay.ui:373
 msgid "Composer Shortcuts"
 msgstr "作成画面のショートカット"
 
-#: ui/gtk/help-overlay.ui:359
+#: ui/gtk/help-overlay.ui:381
 msgctxt "shortcut window"
 msgid "Send"
 msgstr "送信する"
 
-#: ui/gtk/help-overlay.ui:366
+#: ui/gtk/help-overlay.ui:388
 msgctxt "shortcut window"
 msgid "Add attachment"
 msgstr "添付ファイルを追加する"
 
-#: ui/gtk/help-overlay.ui:379
+#: ui/gtk/help-overlay.ui:401
 msgctxt "shortcut window"
 msgid "Close composer window"
 msgstr "作成ウィンドウを閉じる"
 
-#: ui/gtk/help-overlay.ui:386
+#: ui/gtk/help-overlay.ui:408
 msgctxt "shortcut window"
 msgid "Detach composer window"
 msgstr "作成ウィンドウを分離する"
 
-#: ui/gtk/help-overlay.ui:393
+#: ui/gtk/help-overlay.ui:415
 msgctxt "shortcut window"
 msgid "Editing"
 msgstr "編集"
 
-#: ui/gtk/help-overlay.ui:398
+#: ui/gtk/help-overlay.ui:420
 msgctxt "shortcut window"
 msgid "Move selection to the clipboard"
 msgstr "選択範囲をクリップボードへ移動する"
 
-#: ui/gtk/help-overlay.ui:405
+#: ui/gtk/help-overlay.ui:427
 msgctxt "shortcut window"
 msgid "Copy selection to clipboard"
 msgstr "選択範囲をクリップボードにコピーする"
 
-#: ui/gtk/help-overlay.ui:412
+#: ui/gtk/help-overlay.ui:434
 msgctxt "shortcut window"
 msgid "Paste from the clipboard"
 msgstr "クリップボードから貼り付ける"
 
-#: ui/gtk/help-overlay.ui:419
+#: ui/gtk/help-overlay.ui:441
 msgctxt "shortcut window"
 msgid "Quote text"
 msgstr "テキストを引用する"
 
-#: ui/gtk/help-overlay.ui:426
+#: ui/gtk/help-overlay.ui:448
 msgctxt "shortcut window"
 msgid "Unquote text"
 msgstr "テキストの引用を解除する"
 
-#: ui/gtk/help-overlay.ui:435
+#: ui/gtk/help-overlay.ui:457
 msgctxt "shortcut window"
 msgid "Rich text editing"
 msgstr "リッチテキスト編集"
 
-#: ui/gtk/help-overlay.ui:439
+#: ui/gtk/help-overlay.ui:461
 msgctxt "shortcut window"
 msgid "Paste without formatting"
 msgstr "書式なしで貼り付ける"
 
-#: ui/gtk/help-overlay.ui:446
+#: ui/gtk/help-overlay.ui:468
 msgctxt "shortcut window"
 msgid "Bold text"
 msgstr "テキストを太字にする"
 
-#: ui/gtk/help-overlay.ui:453
+#: ui/gtk/help-overlay.ui:475
 msgctxt "shortcut window"
 msgid "Italicize text"
 msgstr "テキストを斜体にする"
 
-#: ui/gtk/help-overlay.ui:460
+#: ui/gtk/help-overlay.ui:482
 msgctxt "shortcut window"
 msgid "Underline text"
 msgstr "テキストに下線を引く"
 
-#: ui/gtk/help-overlay.ui:467
+#: ui/gtk/help-overlay.ui:489
 msgctxt "shortcut window"
 msgid "Strike text"
 msgstr "テキストに取り消し線を引く"
 
-#: ui/gtk/help-overlay.ui:474
+#: ui/gtk/help-overlay.ui:496
 msgctxt "shortcut window"
 msgid "Remove formatting"
 msgstr "書式を削除する"
 
-#: ui/gtk/help-overlay.ui:481
+#: ui/gtk/help-overlay.ui:503
 msgctxt "shortcut window"
 msgid "Insert an image"
 msgstr "画像を挿入する"
 
-#: ui/gtk/help-overlay.ui:488
+#: ui/gtk/help-overlay.ui:510
 msgctxt "shortcut window"
 msgid "Insert a link"
 msgstr "リンクを挿入する"
@@ -3561,6 +3640,16 @@ msgstr "認証(_A)"
 msgid "Geary update in progress…"
 msgstr "Geary を更新しています…"
 
+#~ msgid "Log periodic activity"
+#~ msgstr "定期的なアクティビティを記録する"
+
+#~ msgid "Log IMAP network serialization"
+#~ msgstr "IMAP ネットワークのストリームを記録する"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Find in current conversations"
+#~ msgstr "現在のスレッド内を検索する"
+
 #~ msgid "Sent Mail"
 #~ msgstr "送信済みメール"