--- archivemail	2007-02-17 10:32:39.000000000 +1000
+++ archivemail	2007-02-17 10:34:51.000000000 +1000
@@ -1299,7 +1299,8 @@
     imap_filter = build_imap_filter()
     vprint("imap filter: '%s'" % imap_filter)
     try:
-        imap_username, imap_str = imap_str.split('@', 1)
+	imap_username, imap_str = re.split(r"(?<!\\)@", imap_str, 1)
+	imap_username = imap_username.replace('\\@', '@')
         imap_server, imap_folder = imap_str.split('/', 1)
     except ValueError:
         unexpected_error("you must provide a properly formatted "