Routine update. Some shortcuts
Made imap bindings nonrecursive.