From 66e84123724c2e7d43102450247346692c260ab5 Mon Sep 17 00:00:00 2001
From: Henrik Bakken <bakken.henrik@gmail.com>
Date: Tue, 29 Jul 2025 14:34:39 +0200
Subject: [PATCH] aerc binds

---
 aerc/binds.conf | 59 ++++++++++++++++++++++++++++---------------------
 1 file changed, 34 insertions(+), 25 deletions(-)

diff --git a/aerc/binds.conf b/aerc/binds.conf
index 10999a7..fbbaa79 100644
--- a/aerc/binds.conf
+++ b/aerc/binds.conf
@@ -1,9 +1,5 @@
-<C-i> = :next-tab<Enter>
-<C-o> = :prev-tab<Enter>
 <C-t> = :term<Enter>
 ? = :help keys<Enter>
-\[t = :prev-tab<Enter>
-\]t = :next-tab<Enter>
 
 [messages]
 ! = :term<space>
@@ -21,20 +17,26 @@ $ = :term<space>
 A  = :unmark -a<Enter>:mark -T<Enter>:archive flat<Enter>
 aa = :archive flat<Enter>
 b = :bounce<space>
-c = :cf<space>
-C = :compose<Enter>
+c = :compose<Enter>
 D  = :delete-message<Enter>
 dd = :mv Trash<Enter>
 f = :forward -A<Enter>
 G = :select -1<Enter>
+gf = :cf<space>
 gg = :select 0<Enter>
 gi = :cf INBOX<Enter>
 gt = :cf Trash<Enter>
 H = :collapse-folder<Enter>
+<C-o> = :prev-message<Enter>
+<backtab> = :prev-message<Enter>
+k = :prev-message<Enter>
+<C-i> = :next-message<Enter>
+<tab> = :next-message<Enter>
+j = :next-message<Enter>
+<C-p> = :prev-tab<Enter>
+<C-n> = :next-tab<Enter>
 J = :next-folder<Enter>
-j = :next<Enter>
 K = :prev-folder<Enter>
-k = :prev<Enter>
 L = :expand-folder<Enter>
 m  = :move<space>
 n = :next-result<Enter>
@@ -65,17 +67,21 @@ D  = :delete-message<Enter>
 [view]
 /  = :toggle-key-passthrough<Enter>/
 |  = :pipe<space>
-<C-n> = :next-part<Enter>
+<C-p> = :prev-tab<Enter>
+<C-n> = :next-tab<Enter>
+<C-i> = :next-part<Enter>
+<tab> = :next-part<Enter>
+<C-o> = :prev-part<Enter>
+<backtab> = :prev-part<Enter>
 <C-l> = :open-link <space>
-<C-p> = :prev-part<Enter>
 A  = :unmark -a<Enter>:mark -T<Enter>:archive flat<Enter>
 aa = :archive flat<Enter>
 D  = :delete-message<Enter>
 dd = :mv Trash<Enter>
 f = :forward -A<Enter>
 H = :toggle-headers<Enter>
-J = :next<Enter>
-K = :prev<Enter>
+J = :next-message<Enter>
+K = :prev-message<Enter>
 m  = :move<space>
 O  = :open<Enter>
 o  = :open<Enter>
@@ -104,39 +110,42 @@ $ex = <C-x>
 $noinherit = true
 <A-n> = :switch-account -n<Enter>
 <A-p> = :switch-account -p<Enter>
+<C-n> = :next-tab<Enter>
+<C-p> = :prev-tab<Enter>
+<C-o> = :prev-field<Enter>
+<C-i> = :next-field<Enter>
 <backtab> = :prev-field<Enter>
-<C-n> = :next-field<Enter>
-<C-i> = :next-tab<Enter>
-<C-p> = :prev-field<Enter>
-<C-o> = :prev-tab<Enter>
 <tab> = :next-field<Enter>
 
 [compose::editor]
 # Keybindings used when the embedded terminal is selected in the compose view
 $noinherit = true
 $ex = <C-x>
-<C-n> = :next-field<Enter>
-<C-i> = :next-tab<Enter>
-<C-p> = :prev-field<Enter>
-<C-o> = :prev-tab<Enter>
+<C-n> = :next-tab<Enter>
+<C-p> = :prev-tab<Enter>
+<C-o> = :prev-field<Enter>
+<C-i> = :next-field<Enter>
+<backtab> = :prev-field<Enter>
+<tab> = :next-field<Enter>
 
 [compose::review]
 y = :send<Enter> # Send
 n = :abort<Enter> # Abort (discard message, no confirmation)
 v = :preview<Enter> # Preview message
 p = :postpone<Enter> # Postpone
-H = :multipart text/html<Enter> # Add html from markdown
+h = :multipart text/html<Enter> # Add html from markdown
+H = :multipart -d text/html<Enter> # Remove html
 q = :choose -o d discard abort -o p postpone postpone<Enter> # Abort or postpone
 Q = :abort<Enter> # Abort
 e = :edit<Enter> # Edit (body and headers)
 a = :attach<space> # Add attachment
 d = :detach<space> # Remove attachment
-s = :sign<Enter> # Toggle signing
-x = :encrypt<Enter> # Toggle encryption to all recipients
+# s = :sign<Enter> # Toggle signing
+# x = :encrypt<Enter> # Toggle encryption to all recipients
 
 [terminal]
 $noinherit = true
 $ex = <C-x>
 
-<C-i> = :next-tab<Enter>
-<C-o> = :prev-tab<Enter>
+<C-n> = :next-tab<Enter>
+<C-p> = :prev-tab<Enter>