merge stable

diff --cc imap/command.c
Simple merge

diff --cc imap/imap.c
Simple merge

diff --cc menu.c
Simple merge