- (define-key map (kbd "C-c C-c") #'notmuch-mua-send-and-exit)
- (define-key map (kbd "C-c C-s") #'notmuch-mua-send)
+ (define-key map [remap message-send-and-exit] #'notmuch-mua-send-and-exit)
+ (define-key map [remap message-send] #'notmuch-mua-send)