diff --git a/emacs/mu4e-hdrs.el b/emacs/mu4e-hdrs.el
index ddaa4acb..75993d26 100644
--- a/emacs/mu4e-hdrs.el
+++ b/emacs/mu4e-hdrs.el
@@ -749,12 +749,11 @@ otherwise, limit to up to `mu4e-search-results-limit'."
   (when expr
     (mu4e-hdrs-search expr current-prefix-arg)))
 
-
 (defun mu4e-hdrs-kill-buffer-and-window ()
   "Quit the message view and return to the main view."
   (interactive)
   (mu4e-kill-buffer-and-window mu4e-hdrs-buffer)
-  (mu4e))  
+  (mu4e-main-view))  
 
 (defun mu4e-rerun-search ()
   "Rerun the search for the last search expression; if none exists,
diff --git a/emacs/mu4e-utils.el b/emacs/mu4e-utils.el
index cd5b9770..c1bf6c95 100644
--- a/emacs/mu4e-utils.el
+++ b/emacs/mu4e-utils.el
@@ -312,10 +312,9 @@ point in eiter the headers buffer or the view buffer."
 simply does not attempt to delete the window if there is none,
 instead of erroring out."
   (when (buffer-live-p buf) 
-    (with-current-buffer buf
-      (message "deleting all windows showing %S" buf)
+    ((bury-buffer buf)
       (delete-windows-on buf) ;; destroy all windows for this buffer
-      (kill-buffer)))) 
+      (kill-buffer buf)))) 
 
 (defun mu4e-select-other-view ()
   "When the headers view is selected, select the message view (if
diff --git a/emacs/mu4e-view.el b/emacs/mu4e-view.el
index 96ab8855..9865b83c 100644
--- a/emacs/mu4e-view.el
+++ b/emacs/mu4e-view.el
@@ -540,11 +540,8 @@ citations."
 (defun mu4e-view-kill-buffer-and-window ()
   "Quit the message view and return to the headers."
   (interactive)
-  (when (buffer-live-p mu4e-view-buffer)
-    (with-current-buffer mu4e-view-buffer
-      ;; (mu4e-kill-buffer-and-window mu4e-view-buffer)
-      (kill-buffer-and-window))))
-    
+  (mu4e-kill-buffer-and-window mu4e-view-buffer))
+     
 (defun mu4e-view-next-header ()
   "View the next header."
   (interactive)