diff --git a/emacs/mu4e-main.el b/emacs/mu4e-main.el
index aeba3634..3453a8e6 100644
--- a/emacs/mu4e-main.el
+++ b/emacs/mu4e-main.el
@@ -79,14 +79,12 @@ set FUNC to be called with the STR is clicked."
 	 (map (make-sparse-keymap)))
     (define-key map [mouse-2] func)
     (define-key map (kbd "RET") func)
-    (put-text-property 0 (- (length newstr) 1) 'keymap map newstr)
+    (put-text-property 0 (length newstr) 'keymap map newstr)
     (put-text-property (string-match "\\w" newstr)
       (- (length newstr) 1) 'mouse-face 'highlight newstr)
     newstr))
 
 
-
-
 (defun mu4e-main-view()
   "Show the mm main view."
   (let ((buf (get-buffer-create mu4e-main-buffer-name))
diff --git a/emacs/mu4e-proc.el b/emacs/mu4e-proc.el
index 334af238..dce4b548 100644
--- a/emacs/mu4e-proc.el
+++ b/emacs/mu4e-proc.el
@@ -118,7 +118,7 @@ process."
   "Dummy handler function."
   (error "Not handled: %S" args))
 
-(defconst mu4e-server-name "*mu4e-server"
+(defconst mu4e-server-name "*mu4e-server*"
   "*internal* Name of the server process, buffer.")
 
 (defun mu4e-start-proc ()