diff --git a/emacs/mu4e-view.el b/emacs/mu4e-view.el
index 5dd1be96..c9b79667 100644
--- a/emacs/mu4e-view.el
+++ b/emacs/mu4e-view.el
@@ -542,8 +542,10 @@ citations."
   (interactive)
   (when (buffer-live-p mu4e-view-buffer)
     (with-current-buffer mu4e-view-buffer
-      (kill-buffer-and-window))))
-
+      (if (window-parent)
+	(kill-buffer-and-window)
+	(kill-buffer)))))
+      
 (defun mu4e-view-next-header ()
   "View the next header."
   (interactive)