diff --git a/ui/gtk/help-overlay.ui b/ui/gtk/help-overlay.ui
index be856c1e..2ec893d9 100644
--- a/ui/gtk/help-overlay.ui
+++ b/ui/gtk/help-overlay.ui
@@ -7,6 +7,181 @@
12
conversation
Conversation Shortcuts
+
+
+
+
+
+ True
+ Search
+
+
+ True
+ Search for conversations
+ <primary>S
+
+
+
+
+ True
+ Find in current conversation
+ <primary>F
+
+
+
+
+
+
+
+ True
+ Undo
+
+
+ True
+ Undo the last action
+ <primary>Z
+
+
+
+
+ True
+ Redo the last action
+ <primary><Shift>Z
+
+
+
+
+
+
+ True
+ View
+
+
+ True
+ Zoom in
+ <primary>plus
+
+
+
+
+ True
+ Zoom out
+ <primary>minus
+
+
+
+
+ True
+ Reset zoom
+ <primary>0
+
+
+
+
True
@@ -14,43 +189,22 @@
True
- Move focus to the next/previous pane
- F6 <Shift>F6
-
-
-
-
- True
- Move focus to conversation list
- <primary>B
-
-
-
-
- True
- Detach composer window
- <primary>D
-
-
-
-
- True
- Close composer window
- <primary>W Escape
+ Show help
+ F1
True
Show keyboard shortcuts
- <Primary>F1 <Primary>question
+ <Primary>question
True
- Show help
- F1
+ Close current window
+ <primary>W
@@ -65,182 +219,121 @@
True
- Search
+ Keyboard navigation
True
- Jump to search box
- <primary>S
+ Focus the next pane
+ F6
True
- Find in current conversation
- <primary>F
+ Focus the previous pane
+ <Shift>F6
True
- Find next/previous in current conversation
- <primary>G <primary><Shift>G
-
-
-
-
-
-
- True
- Actions
-
-
- True
- Compose a new message
- <primary>N
+ Focus the conversation list
+ <primary>B
True
- Reply to sender
- <primary>R R
-
-
-
-
- True
- Reply to all
- <primary><Shift>R <Shift>R
-
-
-
-
- True
- Forward
- <primary>L F
-
-
-
-
- True
- Archive
- A
-
-
-
-
- True
- Move to trash
- Delete Back
-
-
-
-
- True
- Toggle spam
- <primary>J exclam
-
-
-
-
- True
- Move the conversation
- M
-
-
-
-
- True
- Label the conversation
- L
-
-
-
-
-
- True
- Mark read
- <primary>I <Shift>I
-
-
-
-
- True
- Mark unread
- <primary>U <Shift>U
-
-
-
-
-
-
- True
- View
-
-
- True
- Zoom in
- <primary>equal equal
-
-
-
-
- True
- Zoom out
- <primary>minus minus
-
-
-
-
- True
- Reset zoom
- <primary>0 0
-
-
-
-
-
-
- True
- Additional Shortcuts
-
-
- True
- Star
- S
-
-
-
-
- True
- Unstar
- D
-
-
-
-
- True
- Delete
- <Shift>Delete <Shift>Back
-
-
-
-
- True
- Jump to next (older) conversation
+ Select next conversation down
J
True
- Jump to previous (newer) conversation
+ Select previous conversation up
K
+
+
+ True
+ Focus next/previous message
+ space <shift>space
+
+
+
+
+ True
+ Single-key shortcuts
+
+
+ True
+ Reply to sender
+ R
+
+
+
+
+ True
+ Reply to all
+ <Shift>R
+
+
+
+
+ True
+ Forward
+ F
+
+
+
+
+ True
+ Mark/un-mark read
+ <Shift>I <Shift>U
+
+
+
+
+ True
+ Mark/un-mark starred
+ S D
+
+
+
+
+ True
+ Archive conversation
+ A
+
+
+
+
+ True
+ Move conversation
+ M
+
+
+
+
+ True
+ Label conversation
+ L
+
+
+
+
+ True
+ Move to Spam
+ exclam
+
+
+
+
@@ -248,26 +341,6 @@
True
composer
Composer Shortcuts
-
-
- True
- General
-
-
- True
- Quote text
- <primary>bracketleft
-
-
-
-
- True
- Unquote text
- <primary>bracketright
-
-
-
-
True
@@ -291,7 +364,74 @@
True
- Rich text mode
+ General
+
+
+ True
+ Close composer window
+ <primary>W Escape
+
+
+
+
+ True
+ Detach composer window
+ <primary>D
+
+
+
+
+ True
+ Editing
+
+
+ True
+ Move selection to the clipboard
+ <primary>C
+
+
+
+
+ True
+ Copy selection to clipboard
+ <primary>C
+
+
+
+
+ True
+ Paste from the clipboard
+ <primary>V
+
+
+
+
+ True
+ Quote text
+ <primary>bracketleft
+
+
+
+
+ True
+ Unquote text
+ <primary>bracketright
+
+
+
+
+
+
+ True
+ Rich text editing
+
+
+ True
+ Paste without formatting
+ <primary><shift>V
+
+
True
@@ -323,15 +463,22 @@
True
- Insert a link
- <primary>L
+ Remove formatting
+ <primary>space
True
- Remove formatting
- <primary>space
+ Insert an image
+ <primary>I
+
+
+
+
+ True
+ Insert a link
+ <primary>L