diff --git a/toys/mm/mm-hdrs.el b/toys/mm/mm-hdrs.el
index c774c209..c0099429 100644
--- a/toys/mm/mm-hdrs.el
+++ b/toys/mm/mm-hdrs.el
@@ -184,8 +184,6 @@ if provided, or at the end of the buffer otherwise."
     (define-key map "p" 'mm/prev-header)
     (define-key map "j" 'mm/jump-to-maildir)
 
-
-
     ;; marking/unmarking/executing
     (define-key map "m" 'mm/mark-for-move)
 
@@ -296,7 +294,7 @@ provided, put it at the end of the buffer."
 	  (let ((inhibit-read-only t) (pos (marker-position marker)))
 	    (goto-char pos)
 	    (delete-char 2)
-	    (insert mark " ")
+	    (insert (propertize mark 'face 'mm/hdrs-marks-face) " ")
 	    (put-text-property pos
 	      (line-beginning-position 2) 'docid docid)
 	    ;; update the msg-map, ie., move it back to the start of the line
@@ -478,11 +476,11 @@ start editing it. COMPOSE-TYPE is either `reply', `forward' or
     (kill-buffer)
     (mm)))
 
-;; TODO implement
-(defun mm/change-sort ()
-  "Change the sorting field and/or direction."
-  (interactive)
-  )
+;;;;  TODO implement
+;; (defun mm/change-sort ()
+;;   "Change the sorting field and/or direction."
+;;   (interactive)
+;;  )
 
 (defun mm/rerun-search ()
   "Rerun the search for the last search expression; if none exists,
@@ -524,29 +522,6 @@ return the new docid. Otherwise, return nil."
     (mm/hdrs-search (concat "maildir:" fld))))
 
 
-;; (defun mm/select ()
-;;   "Select the current messsage."
-;;   (interactive)
-;;   (with-current-buffer mm/hdrs-buffer
-;;     (mm/hdrs-mark 'select)
-;;     (mm/next-header)))
-
-;; (defun mm/mark-selected (marktype)
-;;   "If any headers have been selected, set the mark for all of them;
-;; otherwise, return nil."
-;;   (let ((selected) (target))
-;;     (maphash
-;;       (lambda (docid val)
-;; 	(when (eq (car val) 'select)
-;; 	  (setq selected t)
-;; 	  (case marktype
-
-;;       mm/marks-map
-
-
-
-
-
 
 (defun mm/mark-for-move ()
   "Mark message at point for moving to a maildir."
diff --git a/toys/mm/mm-proc.el b/toys/mm/mm-proc.el
index a6c1ce65..011cdcf9 100644
--- a/toys/mm/mm-proc.el
+++ b/toys/mm/mm-proc.el
@@ -121,6 +121,7 @@ process."
   (let* ((process-connection-type nil) ;; use a pipe
 	  (coding-system-for-read 'utf-8)
 	  (coding-system-for-write 'no-conversion)
+	  (process-adaptive-read-buffering t)
 	  (args '("server"))
 	  (args (append args (when mm/mu-home
 			       (list (concat "--muhome=" mm/mu-home))))))
diff --git a/toys/mm/mm-send.el b/toys/mm/mm-send.el
index 6ebe5e14..ab65972d 100644
--- a/toys/mm/mm-send.el
+++ b/toys/mm/mm-send.el
@@ -407,7 +407,7 @@ This is meant to be called from message mode's
 	  (let ((refs))
 	    (while (re-search-forward "<[^ <]+@[^ <]+>" nil t)
 	      (push (match-string 0) refs))
-	    (setq forwarded-from (last refs))))))
+	    (setq forwarded-from (car-safe (last refs)))))))
 
     ;; remove the <>
     (when (and in-reply-to (string-match "<\\(.*\\)>" in-reply-to))
diff --git a/toys/mm/mm-view.el b/toys/mm/mm-view.el
index c45e30c1..55780241 100644
--- a/toys/mm/mm-view.el
+++ b/toys/mm/mm-view.el
@@ -173,7 +173,6 @@ or if not available, :body-html converted to text)."
     (define-key map "j" 'mm/jump-to-maildir)
 
     (define-key map "g" 'mm/view-go-to-url)
-
     (define-key map "f" 'mm/compose-forward)
     (define-key map "r" 'mm/compose-reply)
     (define-key map "c" 'mm/compose-new)
@@ -185,6 +184,10 @@ or if not available, :body-html converted to text)."
       '(lambda () (interactive) (goto-char (point-min))))
     (define-key map (kbd "<end>")
       '(lambda () (interactive) (goto-char (point-max))))
+    (define-key map (kbd "RET")
+      '(lambda () (interactive) (scroll-up 1)))
+    (define-key map (kbd "<backspace>")
+      '(lambda () (interactive) (scroll-up -1)))
 
 
     ;; navigation between messages
@@ -206,7 +209,7 @@ or if not available, :body-html converted to text)."
 
     ;; misc
     (define-key map "w" 'mm/view-toggle-wrap-lines)
-    (define-key map "h" 'mm/view-toggle-hide-quoted)
+    (define-key map "h" 'mm/view-toggle-hide-cited)
 
     (define-key map "R" 'mm/view-refresh)
     
@@ -272,7 +275,7 @@ removing '^M' etc."
 
     ;; remove the stupid CRs
     (goto-char (point-min))
-    (while (re-search-forward "
\\| " nil t)
+    (while (re-search-forward "[
 ]" nil t)
       (replace-match "" nil t))
 
     ;; give the footer a different color...
diff --git a/toys/mm/mm.el b/toys/mm/mm.el
index b98378fd..89b171e9 100644
--- a/toys/mm/mm.el
+++ b/toys/mm/mm.el
@@ -233,7 +233,7 @@ be sure it no longer matches)."
   :group 'mm/faces)
 
 (defface mm/view-attach-number-face
-  '((t :inherit font-lock-builtin-face :bold t))
+  '((t :inherit font-lock-variable-name-face :bold t))
   "Face for the number tags for attachments."
   :group 'mm/faces)
 
@@ -242,6 +242,11 @@ be sure it no longer matches)."
   "Face for message footers (signatures)."
   :group 'mm/faces)
 
+(defface mm/hdrs-marks-face
+  '((t :inherit font-lock-preprocessor-face))
+  "Face for the mark in the headers list."
+  :group 'mm/faces)
+
 
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;