diff --git a/emacs/mu4e-main.el b/emacs/mu4e-main.el
index a3f7145f..fa59c3f1 100644
--- a/emacs/mu4e-main.el
+++ b/emacs/mu4e-main.el
@@ -1,12 +1,10 @@
 ;;; mu4e-main.el -- part of mm, the mu mail user agent
 ;;
-;; Copyright (C) 2011 Dirk-Jan C. Binnema
+;; Copyright (C) 2011-2012 Dirk-Jan C. Binnema
 
 ;; Author: Dirk-Jan C. Binnema <djcb@djcbsoftware.nl>
 ;; Maintainer: Dirk-Jan C. Binnema <djcb@djcbsoftware.nl>
-;; Keywords: email
-;; Version: 0.0
-
+ 
 ;; This file is not part of GNU Emacs.
 ;;
 ;; GNU Emacs is free software: you can redistribute it and/or modify
@@ -27,7 +25,6 @@
 ;;; Code:
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; mm main view mode + keybindings
 (defconst mu4e-main-buffer-name "*mu4e-main*"
   "*internal* Name of the mm main buffer.")
 
@@ -136,8 +133,6 @@ clicked."
       (mu4e-main-mode)
       (switch-to-buffer buf))))
 
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Interactive functions
 
diff --git a/src/mu-store-write.cc b/src/mu-store-write.cc
index 7cb98589..db0a89a6 100644
--- a/src/mu-store-write.cc
+++ b/src/mu-store-write.cc
@@ -137,7 +137,7 @@ mu_store_new_writable (const char* xpath, const char *contacts_cache,
 
 		} MU_STORE_CATCH_BLOCK_RETURN(err,NULL);
 
-	} MU_XAPIAN_CATCH_BLOCK_G_ERROR_RETURN (err,MU_ERROR_XAPIAN, NULL);
+	} MU_XAPIAN_CATCH_BLOCK_G_ERROR_RETURN (err, MU_ERROR_XAPIAN, NULL);
 }