   (if (called-interactively-p) (enh-clear-onmem-cache))
   (unwind-protect
       (let* ((cache (enh-password-cache-load))
-	     (usernames (mapcar #'car cache))
-	     (username (or evernote-username
-			   (read-string "Evernote user name:"
-					(car usernames) 'usernames)))
-	     (cache-passwd (enutil-aget username cache)))
-	(unless (and cache-passwd
-		     (eq (catch 'error 
-			   (progn 
-			     (enh-command-login username cache-passwd)
-			     t))
-			 t))
-	  (let* ((passwd (read-passwd "Passwd:")))
-	    (enh-command-login username passwd)
-	    (setq evernote-username username)
-	    (enh-password-cache-save (enutil-aset username cache passwd)))))
+             (usernames (mapcar #'car cache))
+             (username (or evernote-username
+                           (read-string "Evernote user name:"
+                                        (car usernames) 'usernames)))
+             (cache-passwd (enutil-aget username cache)))
+        (unless (and cache-passwd
+                     (eq (catch 'error 
+                           (progn 
+                             (enh-command-login username cache-passwd)
+                             t))
+                         t))
+          (let* ((passwd (read-passwd "Passwd:")))
+            (enh-command-login username passwd)
+            (setq evernote-username username)
+            (enh-password-cache-save (enutil-aset username cache passwd)))))
     (enh-password-cache-close)))
 
 

  (if (called-interactively-p) (enh-clear-onmem-cache))
  (let ((name (read-string "Saved Search Name:"))
        (query (read-string "Query:")))
  (enh-command-with-auth
   (enh-command-create-search name query))
  (enh-browsing-reflesh-page 'search-list)))


(defun evernote-edit-search ()

  (interactive)
  (if (called-interactively-p) (enh-clear-onmem-cache))
  (when evernote-mode
    (setq evernote-note-modified-name
          (read-string "New note name:"
                       (enutil-aget 'title (enh-get-note-attr evernote-note-guid))))
    (rename-buffer evernote-note-modified-name t)
    (enh-base-change-major-mode-from-note-name evernote-note-modified-name)
    (set-buffer-modified-p t)))


(defun evernote-delete-note ()
