Merge lp:~cfraire/backup-gmail/devel into lp:backup-gmail

[C Fraire]

  * Full and incremental backup are now the same operation, and re-running
 any backup will only write newly-detected messages ('label' is still
 always written fully after each backup). backup-gmail no longer deletes
 any data
  * add KeyringUtil to use keyring library (if available at runtime)
 for secure handling of saved passwords instead of writing plaintext
 to .cfg files. Existing password settings in .cfg files will be used
 but will not be automatically written anymore.
 (See http://pypi.python.org/pypi/keyring for installation help)
  * Use Gmail's XLIST command to map special internationalized folders
  * --mbox_export is now a separate, optional operation, which can be done
 on its own or after a backup
  * backup_gmail.Gmail objects support a graceful cancel() method intended
 to be called from a separate thread (as in gui.py). (Interrupting
 the command-line backup_gmail.py still terminates immediately).
  * gui.py operates directly on backup_gmail.Gmail objects instead of
 running the backup_gmail "do" methods, and it connects the
 QProgressDialog cancel to Gmail.cancel()
  * use explicit en_US date formatting in Gmail.searchByDate, to support
 users with other default locales
  * improved completion messages for restore or save to reflect the count
 of messages handled from the total set
  * progress can use a custom formatter for values, as with backup to
 format values as '%.2f MB'
  * Messages without MESSAGE-ID still get a <email address hidden> id in
 label, but the RFC content is no longer touched
  * Handle invalid dates in messages when filtering by date. Such messages
 will not be matched
  * --strict_exclude indicates that messages are to be skipped by
 MESSAGE-ID in addition to folder
  * add --prompt mode to pass credentials as STDIN instead of the command-line
  * fix: --end_date behavior is date exclusive, so update usage, and
 gui.py now passes date+1
  * fix gui.py bug where include_labels or exclude_labels were not properly
 unset between runs if the mode changed

[lp:~cfraire/backup-gmail/devel]

16. By <email address hidden> on 2011-09-26

- warn to STDERR that keyring module is not active
- For 'fold', do not use strftime on email dates in case time part is
  invalid. Use date[0] and date[1] directly to effect '%Y-%m'
- relax 'AllMail' expectation, since it seems not to pass for
  international Gmail clients. Investigating further....

17. By <email address hidden> on 2011-10-06

- keep backslashes in "special" folder keys from XLIST
- RestoreGmail also uses XLIST "\Inbox" instead of literal 'INBOX' and
  treats \AllMail as optional (given user error report)
- remove now-unneeded getGmailPrefix method

18. By <email address hidden> on 2011-10-16

- Since users can hide special folders in IMAP, treat them as optional
  to avoid KeyError

19. By <email address hidden> on 2011-11-01

- slight fix to Progress objects to avoid outputting when initializing

20. By <email address hidden> on 2011-11-02

- fix localized date handling for gui.py and command-line arguments of
  backup_gmail.py
- fix to support Unicode in ConfigParser files by converting to and from
  Latin-1 encoding
- KNOWN PROBLEM: with filtering non-ASCII mailbox names because imaplib does
  not currently support the IMAP-modified UTF-7 encoded needed for general
  Unicode support.

21. By <email address hidden> on 2011-11-02

- backup_gmail uses imapUTF7 for handling special characters in mailbox
- use utf-8 for .cfg files
- for interacting with backup_gmail lib, convert from PySide unicode to
  utf-8 and back

22. By <email address hidden> on 2011-11-02

- fix: also convert QDateEdit from unicode to and from utf-8 when interacting
  with backup_gmail

23. By <email address hidden> on 2012-01-10

- fix: restore can assign non-ASCII labels via UTF-7
- restore by default restores to \AllMail; can restore to specified --label
- restore no longer puts anything into \Inbox (unless explicit with --label)
- remove redundant clearing of \Seen
- update README with some info on library dependencies

24. By <email address hidden> on 2012-01-11

- improve help strings
- fix scope for raising ApplicationError

25. By <email address hidden> on 2012-01-11

- restore treats 'INBOX' as a special name even for non-English accounts
- improve usage string

26. By <email address hidden> on 2012-01-11

- fix: also UTF-7 decode special folders

27. By <email address hidden> on 2012-01-14

- fix: use BODY.PEEK to effect --keep_status instead of manually unsetting
  \Seen. This fixes the behavior and is no longer a slow operation
- method fetchRFC822Info(...) fetches MESSAGE-ID also, so a separate call
  to fetchMessageId(...) is not required

28. By <email address hidden> on 2012-01-17

- fix: RestoreGmail works around imaplib's Time2InternalDate function to
  avoid sending non-RFC2822 dates to IMAP

29. By <email address hidden> on 2012-01-21

Adding regex handling

- add --match_regex for label filtering
- add FilterLabels class to handle work of filtering
- SaveMbox and RestoreGmail now use non-strict label exclusion by
  default and will recognize --strict_exclude
- improve help strings
- add time zone caveats to README

30. By <email address hidden> on 2012-01-27

--include is now case-insensitive

- also improve FilterLabels and re-use code among BackupGmail,
  SaveMbox, and RestoreGmail

31. By <email address hidden> on 2012-02-28

Update progress only when fetch batches complete

...not after every message is queued or skipped

32. By <email address hidden> on 2016-09-30

Fix to avoid IndexError during restore operations

Also:
- include Joseph Wen's chosen license, GPLv3
- update README

Unmerged revisions

32. By <email address hidden> on 2016-09-30

Fix to avoid IndexError during restore operations

Also:
- include Joseph Wen's chosen license, GPLv3
- update README

31. By <email address hidden> on 2012-02-28

Update progress only when fetch batches complete

...not after every message is queued or skipped

30. By <email address hidden> on 2012-01-27

--include is now case-insensitive

- also improve FilterLabels and re-use code among BackupGmail,
  SaveMbox, and RestoreGmail

29. By <email address hidden> on 2012-01-21

Adding regex handling

- add --match_regex for label filtering
- add FilterLabels class to handle work of filtering
- SaveMbox and RestoreGmail now use non-strict label exclusion by
  default and will recognize --strict_exclude
- improve help strings
- add time zone caveats to README

28. By <email address hidden> on 2012-01-17

- fix: RestoreGmail works around imaplib's Time2InternalDate function to
  avoid sending non-RFC2822 dates to IMAP

27. By <email address hidden> on 2012-01-14

- fix: use BODY.PEEK to effect --keep_status instead of manually unsetting
  \Seen. This fixes the behavior and is no longer a slow operation
- method fetchRFC822Info(...) fetches MESSAGE-ID also, so a separate call
  to fetchMessageId(...) is not required

26. By <email address hidden> on 2012-01-11

- fix: also UTF-7 decode special folders

25. By <email address hidden> on 2012-01-11

- restore treats 'INBOX' as a special name even for non-English accounts
- improve usage string

24. By <email address hidden> on 2012-01-11

- improve help strings
- fix scope for raising ApplicationError

23. By <email address hidden> on 2012-01-10

- fix: restore can assign non-ASCII labels via UTF-7
- restore by default restores to \AllMail; can restore to specified --label
- restore no longer puts anything into \Inbox (unless explicit with --label)
- remove redundant clearing of \Seen
- update README with some info on library dependencies

=== modified file 'CHANGELOG'
--- CHANGELOG	2011-03-12 05:07:18 +0000
+++ CHANGELOG	2016-09-30 23:55:37 +0000
@@ -1,3 +1,94 @@
+backup-gmail 2016-9-30
+  * restore fixes: log error and continue if IMAP append does not succeed
+    with OK. Avoid string index out of range on empty dates.
+
+backup-gmail 2012-2-28
+  * Update progress only when fetch batches complete, not after every 
+    message is queued or skipped
+
+backup-gmail 2012-1-22
+  * backup is now case-insensitive for --include 
+
+backup-gmail 2012-1-18
+  * add --match_regex for label filtering
+  * add FilterLabels class to handle work of filtering
+  * SaveMbox and RestoreGmail now use non-strict label exclusion by default
+    and will recognize --strict_exclude
+  * improve help strings
+  
+backup-gmail 2012-1-17
+  * fix: RestoreGmail works around imaplib's Time2InternalDate function to 
+    avoid sending non-RFC2822 dates to IMAP
+
+backup-gmail 2012-1-14
+  * fix: use BODY.PEEK to effect --keep_status instead of manually unsetting
+    \Seen. This fixes the behavior and is no longer a slow operation
+  * method fetchRFC822Info(...) fetches MESSAGE-ID also, so a separate call
+    to fetchMessageId(...) is not required
+  
+backup-gmail 2012-1-11.1
+  * fix: also UTF-7 decode special folders
+
+backup-gmail 2012-1-11
+  * restore treats 'INBOX' as a special name even for non-English accounts
+  * improve help string
+
+backup-gmail 2012-1-10.1
+  * improve help strings and gui labels
+
+backup-gmail 2012-1-10
+  * fix: restore can assign non-ASCII labels via UTF-7
+  * restore by default restores to \AllMail; can restore to specified --label
+  * restore no longer puts anything into \Inbox (unless explicit with --label)
+  * remove redundant clearing of \Seen in backup if --keep_read_status
+
+backup-gmail 2011-11-2
+  * fix localized date handling for gui.py and command-line arguments of
+    backup_gmail.py
+  * fix gui.py to interact with backup_gmail strictly in utf-8
+  * use imapUTF7 package to handle mailbox names with non-ASCII characters;
+    (thanks to MXM at http://mxm-mad-science.blogspot.com/)
+
+backup-gmail 2011-10-16-1
+  * Since users can hide special folders in IMAP, treat them as
+    optional to avoid KeyError
+    
+backup-gmail 0.2
+  * Full and incremental backup are now the same operation, and re-running
+	any backup will only write newly-detected messages ('label' is still
+	always written fully after each backup). backup-gmail no longer deletes
+	any data
+  * add KeyringUtil to use keyring library (if available at runtime)
+	for secure handling of saved passwords instead of writing plaintext
+	to .cfg files. Existing password settings in .cfg files will be used 
+	but will not be automatically written anymore.
+	(See http://pypi.python.org/pypi/keyring for installation help)
+  * Use Gmail's XLIST command to map special internationalized folders
+  * --mbox_export is now a separate, optional operation, which can be done
+	on its own or after a backup
+  * backup_gmail.Gmail objects support a graceful cancel() method intended
+	to be called from a separate thread (as in gui.py). (Interrupting 
+	the command-line backup_gmail.py still terminates immediately).
+  * gui.py operates directly on backup_gmail.Gmail objects instead of 
+	running the backup_gmail "do" methods, and it connects the 
+	QProgressDialog cancel to Gmail.cancel()
+  * use en_US date formatting in Gmail.searchByDate
+  * improved completion messages for restore or save to reflect the count
+	of messages handled from the total set
+  * progress can use a custom formatter for values, as with backup to
+	format values as '%.2f MB'
+  * Messages without MESSAGE-ID still get a [e-mail] id in 
+	label, but the RFC content is no longer touched
+  * Handle invalid dates in messages when filtering by date. Such messages
+	will not be matched
+  * --strict_exclude indicates that messages are to be skipped by
+	MESSAGE-ID in addition to folder
+  * add --prompt mode to pass credentials as STDIN instead of the command-line
+  * fix: --end_date behavior is date exclusive, so update usage, and 
+	gui.py now passes date+1
+  * fix gui.py bug where include_labels or exclude_labels were not properly
+	unset between runs if the mode changed
+
 backup-gmail 0.1.1
   * Implemented restore function
   * Implemented configure file

=== added file 'LICENSE.txt'
--- LICENSE.txt	1970-01-01 00:00:00 +0000
+++ LICENSE.txt	2016-09-30 23:55:37 +0000
@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    {one line to give the program's name and a brief idea of what it does.}
+    Copyright (C) {year}  {name of author}
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    {project}  Copyright (C) {year}  {fullname}
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.

=== modified file 'README'
--- README	2011-03-10 04:27:09 +0000
+++ README	2016-09-30 23:55:37 +0000
@@ -1,9 +1,52 @@
+backup_gmail
+============
+
 Copyright 2011, Joseph Wen
 
+Copyright 2015, Chris Fraire
+
+This application provides both a command line interface and graphical user
+interface to backup and restore Gmail data via IMAP. It support incremental
+backup based on message-id and sha1. It also preserves the read/unread state
+on the Gmail server.
+
 For more information visit:
-https://launchpad.net/backup-gmail
+https://github.com/idodeclare/backup-gmail
 
-== Usage ==
+Usage 
+=====
 ./backup_gmail.py
+
 or
+
 ./gui.py
+
+Caveats 
+=======
+
+Time Zones
+----------
+  A backup operation processes --start and --end using Gmail's servers,
+and time zones are respected; dates will be qualified using the user's
+configured Gmail time zone.
+
+  --mbox_export and --restore, however, do not currently respect time 
+zones for --start and --end, so results can be slightly incorrect near
+the date range boundaries.
+
+
+Additional Libraries 
+====================
+
+The Qt library, used by gui.py, may need to be installed for platforms
+where it is not available by default (e.g., Mac OS X, Windows, etc.):
+
+  http://www.qt.io/download-open-source/
+
+PySide for Qt, used by gui.py, is available for various platforms at:
+
+  https://wiki.qt.io/Category:LanguageBindings::PySide::Downloads
+
+keyring for Python, used for secure storage of passwords, is available at:
+
+  http://pypi.python.org/pypi/keyring#downloads

=== modified file 'backup_gmail.py'
--- backup_gmail.py	2011-04-14 02:17:02 +0000
+++ backup_gmail.py	2016-09-30 23:55:37 +0000
@@ -2,6 +2,7 @@
 
 """
 Copyright 2011, Joseph Wen
+Copyright 2016, C Fraire <[e-mail]>.
 """
 
 #TODO: MailBox
@@ -10,8 +11,12 @@
 import traceback
 import email.message, email.utils
 import re, sys, hashlib, os, shutil, time, optparse, mailbox, copy
-from datetime import datetime
+import locale
+from datetime import datetime, date
 import ConfigParser
+from imapUTF7 import imapUTF7Encode, imapUTF7Decode
+
+KC_SERVICE_TEMPLATE = 'backup_gmail (%s)'
 
 class MailMetaData:
 	@classmethod
@@ -26,7 +31,6 @@
 			m.labels = set(tmp[4].split(" ^ "))
 		return m
 
-
 	def __init__(self, id, hash_value = None, folder = None):
 		self.id = id
 		self.seen = False
@@ -41,6 +45,69 @@
 	def __str__(self):
 		return "%s %s %s %s %s" % (self.id, self.folder, self.hash_value, str(self.seen), " ^ ".join(self.labels))
 
+class FilterLabels(object):
+	def __init__(self, include_list = None, exclude_list = None, 
+		strict_exclude = None, match_regex = None):
+		self.include_list = include_list
+		self.exclude_list = exclude_list
+		self.strict_exclude = strict_exclude
+		self.match_regex = match_regex
+
+	def __get_include_list(self):
+		return self._include_list 
+
+	def __set_include_list(self, iterable):
+		self._include_list = None
+		if iterable is not None:
+			self._include_list = set(map(lambda y: y.lower(), iterable))
+
+	include_list = property(__get_include_list, __set_include_list)
+
+	def __get_exclude_list(self):
+		return self._exclude_list
+
+	def __set_exclude_list(self, iterable):
+		self._exclude_list = None
+		if iterable is not None:
+			self._exclude_list = set(map(lambda y: y.lower(), iterable))
+	
+	exclude_list = property(__get_exclude_list, __set_exclude_list)
+
+	def __get_strict_exclude(self):
+		return (self._strict_exclude == True)
+
+	def __set_strict_exclude(self, value):
+		self._strict_exclude = (value == True)
+	
+	strict_exclude = property(__get_strict_exclude, __set_strict_exclude)
+			
+	def __get_match_regex(self):
+		return self._match_regex.pattern if self._match_regex else None
+
+	def __set_match_regex(self, match_regex):
+		self._match_regex = None
+		if match_regex is not None:
+			self._match_regex = re.compile(match_regex, re.I)
+	
+	match_regex = property(__get_match_regex, __set_match_regex)
+			
+	def filter(self, iterable):
+		if self.include_list is None:
+			result = list(iterable)
+		else:
+			result = filter(lambda x: x.lower() in self.include_list, iterable)
+			
+		if self.exclude_list is not None:
+			if not self.strict_exclude:
+				result = filter(lambda x: x.lower() not in self.exclude_list, result)
+			elif len(filter(lambda x: x.lower() in self.exclude_list, result)) > 0:
+				result = list()
+
+		# use private directly here
+		if self._match_regex is not None:
+			result = filter(lambda x: self._match_regex.search(x) is not None, result)			
+		return result
+	
 def getMID(env):
 	tmp = re.findall('(<[^>]+>)', env)
 	if len(tmp) == 0:
@@ -87,15 +154,34 @@
 		def __str__(self):
 			return "MailBox [%s] does not exists.\nMailBox List: %s" % (self.str, self.l)
 
-	def __init__(self, username, password):
-		self.gmail_prefix = None
+	class ApplicationError(Exception):
+		def __init__(self, str):
+			self.str = str
+
+		def __str__(self):
+			return repr(self.str)
+
+	def __init__(self, options, progress = None):
+		self.options = options
+		self.progress = progress
+		self.mails = {}
+		self.mboxs = {}
+		self.labels = set()
+		self.gmail = None
+		self.peek = True
+		self.canceling = False
+		
+	def cancel(self):
+	  self.canceling = True
+
+	def login(self):
 		self.gmail = imaplib.IMAP4_SSL('imap.gmail.com', 993)
 		try:
-			ret, message = self.gmail.login(username, password)
+			ret, message = self.gmail.login(self.options.username, self.options.password)
 		except Exception as e:
 			raise self.AuthError("username or password incorrect")
-
-	def resultCountCheck(self, result, number):
+		
+	def __resultCountCheck(self, result, number):
 		if number.find(':') == -1:
 			return len(result) == 1
 		else:
@@ -105,68 +191,132 @@
 	@UIDconverter
 	def fetchRFC822(self, uid):
 		data = []
-		while not self.resultCountCheck(data, uid):
-			ret, data = self.gmail.fetch(uid, 'RFC822')
+		while not self.__resultCountCheck(data, uid):
+			ret, data = self.gmail.fetch(uid, '(BODY.PEEK[])' if self.peek else 'RFC822')
 			data = filter(lambda x: len(x) == 2, data)
 			data = map(lambda x:(getUID(x[0]), x[1]), data)
 		return data
 
 	@UIDconverter
-	def fetchMessageId(self, uid):
+	def fetchMessageId(self, uid): # return UID, MESSAGE-ID
 		data = []
-		while not self.resultCountCheck(data, uid):
-			ret, data = self.gmail.fetch(uid, '(BODY[HEADER.FIELDS (MESSAGE-ID)])')
+		while not self.__resultCountCheck(data, uid):
+			ret, data = self.gmail.fetch(uid, '(BODY.PEEK[HEADER.FIELDS (MESSAGE-ID)])' if self.peek \
+				else '(BODY[HEADER.FIELDS (MESSAGE-ID)])')
 			data = filter(lambda x: len(x) == 2, data)
 			data = map(lambda x:(getUID(x[0]), getMID(x[1])), data)
 		return data
 
 	@UIDconverter
-	def fetchRFC822Info(self, uid): # return UID, SIZE, SEEN
+	def fetchRFC822Info(self, uid): # return UID, SIZE, SEEN, MESSAGE-ID
 		data = []
-		while not self.resultCountCheck(data, uid):
-			ret, data = self.gmail.fetch(uid, '(RFC822.SIZE FLAGS)')
-			data = map(lambda x : (getUID(x), re.findall('RFC822.SIZE ([0-9]+)', x)[0], re.search("Seen", x) != None), data)
+		while not self.__resultCountCheck(data, uid):
+			ret, data = self.gmail.fetch(uid, 
+				'(RFC822.SIZE FLAGS BODY.PEEK[HEADER.FIELDS (MESSAGE-ID)])' if self.peek \
+				else '(RFC822.SIZE FLAGS BODY[HEADER.FIELDS (MESSAGE-ID)])')
+			data = filter(lambda x: len(x) == 2, data)
+			data = map(lambda x : (getUID(x[0]), 
+					re.findall('RFC822.SIZE ([0-9]+)', x[0])[0], 
+					re.search("Seen", x[0]) != None,
+					getMID(x[1])), 
+				data)
 		return data
 
+	# start is inclusive, end is exclusive
 	def searchByDate(self, start, end = None):
 		if start == None and end == None:
 			ret, result = self.gmail.search(None, 'ALL')
 			return result[0].split()
 		elif end == None:
-			ret, result = self.gmail.search(None, '(SINCE "%s")' % (start, ))
+			gstart = GmailDate.fromLocal(start)
+			ret, result = self.gmail.search(None, '(SINCE "%s")' % (gstart, ))
 			return result[0].split()
 		elif start == None:
-			ret, result = self.gmail.search(None, '(BEFORE "%s")' % (end, ))
+			gend = GmailDate.fromLocal(end)
+			ret, result = self.gmail.search(None, '(BEFORE "%s")' % (gend, ))
 			return result[0].split()
 		else:
-			ret, result = self.gmail.search(None, '(SINCE "%s") (BEFORE "%s")' % (start, end))
+			gstart = GmailDate.fromLocal(start)
+			gend = GmailDate.fromLocal(end)
+			ret, result = self.gmail.search(None, '(SINCE "%s") (BEFORE "%s")' % (gstart, gend))
 			return result[0].split()
 
+	def get_FilterLabels(self):
+		lfilt = FilterLabels()
+		if self.options.include_labels is not None:
+			lfilt.include_list = self.options.include_labels.split('^')
+		if self.options.exclude_labels is not None:
+			lfilt.exclude_list = self.options.exclude_labels.split('^')
+		lfilt.strict_exclude = self.options.strict_exclude
+		lfilt.match_regex = self.options.match_regex
+		return lfilt
+
+	def fetchSpecialLabels(self):
+		ret, result = self.gmail.xatom('XLIST', '', '*')
+		xlist = self.gmail.response('XLIST')[1]
+		xlabels = {}
+		for x in xlist:
+			m = re.match(r'\(([^\)]+)\) "/" "([^"]+)"', x)
+			if m is None:
+				continue
+			attrbs = set(m.group(1).split())
+			utf7label = m.group(2)
+			label = imapUTF7Decode(utf7label).encode('utf-8')
+
+			for attr in ['\\Inbox', '\\AllMail', '\\Drafts', '\\Sent', '\\Starred', '\\Trash' ]:
+				if attr in attrbs:
+					xlabels[attr] = label
+		return xlabels
+
 	def fetchLabelNames(self):
 		labels = self.gmail.list()[1]
-		return map(lambda x:x[0], 
+		return map(lambda x:imapUTF7Decode(x).encode('utf-8'),
+			map(lambda x:x[0], 
 			filter(lambda x : len(x) > 0, 
-			map(lambda x : re.findall('\(\\\\HasNoChildren\) "/" "([^"]+)"', x), labels)))
+			map(lambda x : re.findall('\(\\\\HasNoChildren\) "/" "([^"]+)"', x), labels))))
+
+	def isValidMailBox(self, name):
+		ret, mail_count = self.gmail.select(imapUTF7Encode(name.decode('utf-8')))
+		return (ret != 'NO')
 
 	def selectMailBox(self, name):
-		ret, mail_count = self.gmail.select(name)
+		ret, mail_count = self.gmail.select(imapUTF7Encode(name.decode('utf-8')))
 		if ret == 'NO':
 			raise self.SelectMailBoxError(name, self.fetchLabelNames())
 		return mail_count
 
-	def getGmailPrefix(self):
-		if self.gmail_prefix != None:
-			return self.gmail_prefix
-		labels = self.fetchLabelNames()
-		prefixs = filter(lambda x: x.find('/All Mail') != -1, labels)
-		if len(prefixs) == 0:
-			raise self.SelectMailBoxError('<All Mail>', labels)
-
-		p = prefixs[0].split('/')[0]
-		if len(prefixs) > 1:
-			print "There are multiple possible prefixs for Gmail mailbox use [%s]" % (p, )
-		self.gmail_prefix = p
-		return self.gmail_prefix
+	def checkDir(self):		
+		if not os.path.isdir(self.options.backup_dir):
+			raise self.ApplicationError('[%s] is not a directory!\n' % (self.options.backup_dir, ))
+
+	def readLabelFile(self):
+		labelFile = "%s/label" % (self.options.backup_dir, )
+		if os.path.exists(labelFile):
+			with open(labelFile) as f:
+				for line in f:
+					m = MailMetaData.fromStr(line.strip())
+					self.mails[m.id] = m
+					for l in m.labels:
+						self.labels.add(l)
+
+	def isInTimeFrame(self, date_range, dateTuple):
+		if dateTuple == None:
+			return True
+		if date_range == None or (date_range[0] == None and date_range[1] == None):
+			return True
+		try:
+			date = datetime(*dateTuple[:7])
+		except:
+			return False
+		if date_range[0] == None:
+			end = datetime.strptime(date_range[1], "%d-%b-%Y")
+			return date < end
+		if date_range[1] == None:
+			start = datetime.strptime(date_range[0], "%d-%b-%Y")
+			return start < date 
+		start = datetime.strptime(date_range[0], "%d-%b-%Y")
+		end = datetime.strptime(date_range[1], "%d-%b-%Y")
+		return start < date and date < end
 
 	def setFlag(self, uid, flag):
 		self.gmail.store(uid, '+Flags', flag)
@@ -175,278 +325,360 @@
 		self.gmail.store(uid, '-Flags', flag)
 
 class BackupGmail(Gmail):
-	def __init__(self, username, password, dest, progress = None):
-		super(BackupGmail, self).__init__(username, password)
-		self.mboxs = {}
-		self.mails = {}
-		self.keep_read_status = False
-		self.progress = progress
-		self.dest = dest
+	def __init__(self, options, progress = None):
+		super(BackupGmail, self).__init__(options, progress)
 		self.exclude_mids = set()
+		self.written = {}
 
 		self.fetchBuffer = []
 		self.fetchStart = '-1'
 		self.fetchEnd = '-1'
 		self.fetchSize = 0
 
-	def addToMBox(self, label, mail):
-		if label not in self.mboxs:
-			self.mboxs[label] = mailbox.mbox('%s/%s.mbox' % (self.dest, label.replace('/', '-'), ), create = True)
-		self.mboxs[label].add(mail)
+	def formatMegabytes(self, v):
+		v /= 1000000.0
+		return '%.2f MB' % (v,)
 
-	def initProgress(self, infos):
+	def __initProgress(self, infos):
 		total = sum(map(lambda x:int(x[1]), infos))
-		self.progress.setRange(0, total)
-		self.progress.setValue(0)
-
-	def fetchMailByLabel(self, label, date_range):
-		self.progress.setText("\rFetching %s [calculate size]                           \r" % (label, ))
+		self.progress.formatter = self.formatMegabytes
+		self.progress.setRange(0, total, 0)
+
+	def __fetchMailByLabel(self, label, date_range):
+		self.progress.setText("Fetching %s [calculate size]" % (label, ))
+
+		isValid = self.isValidMailBox(label)
+		if isValid == False:
+			self.progress.setText("Label [%s] cannot be selected." % (label, ))
+			self.progress.newLine()
+			return
+
 		mail_count = self.selectMailBox(label)
 		if date_range[0] == None and date_range[1] == None:
 			infos = self.fetchRFC822Info('1:%s' % (mail_count[0], ))
-			envs = self.fetchMessageId('1:%s' % (mail_count[0], ))
 		else:
 			date_range = self.searchByDate(*date_range)
 			infos = self.fetchRFC822Info(date_range)
-			envs = self.fetchMessageId(date_range)
-
-		self.progress.setText("\rFetching %s [@value/@max]                           \r" % (label, ))
-		self.initProgress(infos)
-		total = 0
-
-		for i, (env, info) in enumerate(zip(envs, infos)):
-			uid, mid = env
-			uid, size, seen = info
+
+		self.__initProgress(infos)
+		self.progress.setText("Fetching %s [@value/@max]" % (label, ))
+
+		for i, info in enumerate(infos):
+			if self.canceling:
+			  break
+			uid, size, seen, mid = info
 			if mid not in self.mails:
 				if mid not in self.exclude_mids:
-					self.fetchMail(uid, seen, label, size)
+					self.__fetchMail(uid, seen, label, size)
 			else:
 				self.mails[mid].labels.add(label)
-				self.addToMBox(label, self.mails[mid].getMail(self.dest))
-				if seen == False and self.keep_read_status:
-					self.unsetFlag(uid, '\\Seen')
-			total += int(size)
-			self.progress.setValue(total)
+				self.progress.setValue(self.progress.value + int(size), True)
 			
 		#Flush all pending request
-		self.flushFetchMailRequest()
-
-	def processMail(self, rfc, seen, label):
+		self.__flushFetchMailRequest()
+
+		self.progress.setText("Fetched %s [@value/@max]" % (label, ))
+		self.progress.newLine()
+
+	def __processMail(self, rfc, seen, label):
 		mail = email.message_from_string(rfc)
 		date = email.utils.parsedate(mail.get('date'))
 		if date == None or len(date) != 9:
 			fold = "Date-Unknown"
 		else:
-			fold = time.strftime("%Y-%m", date)
+			# %Y-%m directly from the tuple, in case time part is invalid
+			fold = "%04d-%02d" % (date[0], date[1])
+
 		h = hashlib.sha256(rfc).hexdigest()
 		mid = mail.get('message-id')
 		if mid == None: 
 			mid = "<[e-mail]>" % (h, )
-			mail.add_header('message-id', mid)
-			rfc = mail.as_string()
-			mail = email.message_from_string(rfc)
-		try:
-			os.mkdir("%s/%s" % (self.dest, fold))
-		except OSError as e:
-			pass
-		with open("%s/%s/%s" % (self.dest, fold, h), 'w') as f:
-			f.write(rfc)
+
+		mdir = "%s/%s" % (self.options.backup_dir, fold)
+		if not os.path.isdir(mdir):
+			os.mkdir(mdir)
+
+		mfile = "%s/%s/%s" % (self.options.backup_dir, fold, h)
+		if not os.path.exists(mfile):
+			with open(mfile, 'w') as f:
+				try:
+					f.write(rfc)			
+				except:
+					# in case the write fails, delete the file 
+					f.close()
+					os.remove(mfile)
+					raise
+			self.written[mid] = h
 
 		if mid not in self.mails:
 			self.mails[mid] = MailMetaData(mid, h, fold)
 			self.mails[mid].seen = seen
 
 		self.mails[mid].labels.add(label)
-		self.addToMBox(label, mail)
 
-	def flushFetchMailRequest(self):
+	def __flushFetchMailRequest(self):
 		if self.fetchBuffer == []:
 			return
 
 		rfcs = self.fetchRFC822('%s:%s' % (self.fetchStart, self.fetchEnd))
-		if self.keep_read_status:
-			for i, rfc in enumerate(rfcs):
-				if self.fetchBuffer[i][0] == False:
-					self.unsetFlag(rfc[0], '\\Seen')
 		for i, rfc in enumerate(rfcs):
-			self.processMail(rfc[1], *self.fetchBuffer[i])
+			self.__processMail(rfc[1], *self.fetchBuffer[i])
 
+		self.progress.setValue(self.progress.value + self.fetchSize)
 		self.fetchBuffer = []
 		self.fetchEnd = '-1'
 		self.fetchSize = 0
 
-	def fetchMail(self, uid, seen, label, size):
+	def __fetchMail(self, uid, seen, label, size):
 		size = int(size)
 		if len(self.fetchBuffer) > 300 or self.fetchSize > 10000000:
-			self.flushFetchMailRequest()
+			self.__flushFetchMailRequest()
 		if int(self.fetchEnd) + 1 == int(uid):
 			self.fetchEnd = uid
 			self.fetchBuffer += [(seen, label)]
 			self.fetchSize += size
 		else:
-			self.flushFetchMailRequest()
+			self.__flushFetchMailRequest()
 			self.fetchStart = uid
 			self.fetchEnd = uid
 			self.fetchBuffer += [(seen, label)]
 			self.fetchSize += size
-	
-	def fetchAllLabel(self, date_range, exclude_labels = []):
-		#FIXME need support for multi lanugage
-		#ignore = ['%s/All Mail' % (self.getGmailPrefix(), ),
-		#		'%s/Trash' % (self.getGmailPrefix(), ),
-	        #   		'%s/Spam' % (self.getGmailPrefix(), )] + exclude_labels
-		#labels = filter(lambda x : x not in ignore , self.fetchLabelNames())
+
+	# Fetch default Gmail folders excluding the special \Drafts and \Trash 
+	def __fetchDefaultLabels(self):
 		labels = self.fetchLabelNames()
-
-		for l in labels:
-			self.fetchMailByLabel(l, date_range)
-
-	def fetchAllMail(self, date_range, exclude_labels = []):
-		if exclude_labels != []:
-			labels = filter(lambda x : x in exclude_labels, self.fetchLabelNames())
-			for l in labels:
-				mail_count = self.selectMailBox(l)
-				tmp = set(map(lambda x:x[1], self.fetchMessageId("1:%s" % (mail_count[0], ))))
-				self.exclude_mids.update(tmp)
-		#FIXME need support for multi lanugage
-		#self.fetchMailByLabel('%s/All Mail' % (self.getGmailPrefix(), ), date_range)
-		self.fetchAllLabel(date_range, exclude_labels)
+		specials = self.fetchSpecialLabels()
+		if '\\AllMail' in specials:     # AllMail with no space
+			allMail = specials['\\AllMail'] 
+			if allMail not in labels:
+				labels.append(allMail)
+		ignore = []
+		for labelkey in [ '\\Drafts', '\\Trash' ]:
+			if labelkey in specials:
+				ignore.append(specials[labelkey])
+		labels = filter(lambda x : x not in ignore , labels)
+		return labels
+
+	def __fetchByLabels(self):
+		self.written = {}
+		self.exclude_mids = set()
+
+		lfilt = self.get_FilterLabels()
+		lfilt.strict_exclude = False  # strict_exclude is done via exclude_mids below
+		exclude_labels = lfilt.exclude_list
+
+		if self.options.strict_exclude and exclude_labels is not None:
+			for l in exclude_labels:
+				if self.isValidMailBox(l):
+					mail_count = self.selectMailBox(l)
+					tmp = set(map(lambda x:x[1], self.fetchMessageId("1:%s" % (mail_count[0], ))))
+					self.exclude_mids.update(tmp)
+
+		date_range = [self.options.start_date, self.options.end_date]
+
+		default_labels = self.__fetchDefaultLabels()
+		backupLabel = lfilt.filter(default_labels)
+		for l in backupLabel:
+			if self.canceling:
+				self.progress.setText("Backup was canceled by user.")
+				self.progress.newLine()
+				break;
+			self.__fetchMailByLabel(l, date_range)
+			
+		self.progress.setText("Backed up %d previously-unseen message(s)." % (len(self.written), ))
+		self.progress.newLine()
 	
-	def outputLable(self):
-		with open(self.dest + '/label', 'w') as f:
+	def __outputLable(self):
+		with open(self.options.backup_dir + '/label', 'w') as f:
 			for k in self.mails:
 				print >> f, self.mails[k]
 
-	def checkDir(self, overwrite):
-		try:
-			os.mkdir(self.dest)
-		except OSError as e:
-			if e.errno == 17:
-				if overwrite == False:
-					s = raw_input("[%s] Already exists overwrite? (use -i for incremental backup) [N/y]" % (e.filename, ))
-				else:
-					s = 'Y'
-				if s == 'Y' or s == 'y' or s == 'yes':
-					shutil.rmtree(self.dest)
-					os.mkdir(self.dest)
-				else:
-					exit()
-			else:
-				raise e
-	
-	def doBackup(self, date_range = None, include_labels = None, exclude_labels = None):
-		try:
-			self.mboxs = {}
-			if include_labels == None and exclude_labels == None:
-				self.fetchAllMail(date_range)
-			elif include_labels != None:
-				for l in include_labels:
-					self.fetchMailByLabel(l, date_range)
-			elif exclude_labels != None:
-				self.fetchAllMail(date_range, exclude_labels)
+	def makeDir(self):
+		if not os.path.exists(self.options.backup_dir):
+			os.mkdir(self.options.backup_dir)
+		self.checkDir()
+
+	def execute(self):
+		self.login()
+		self.peek = self.options.keep_read
+		self.makeDir()
+		self.readLabelFile()
+
+		try:
+			self.__fetchByLabels()
 		finally:
-			self.outputLable()
-			for m in self.mboxs:
-				self.mboxs[m].flush()
-
-	def backupTo(self, date_range = None, overwrite = False, include_labels = None, exclude_labels = None):
-		self.checkDir(overwrite)
-		self.doBackup(date_range, include_labels, exclude_labels)
-
-	def incrementalBackupTo(self, date_range = None, include_labels = None, exclude_labels = None):
-		try:
-			with open("%s/label" % (self.dest, )) as f:
-				for line in f.readlines():
-					m = MailMetaData.fromStr(line.strip())
-					self.mails[m.id] = m
-		except:
-			self.backupTo(date_range, False, include_labels, exclude_labels)
-			return
-		self.doBackup(date_range, include_labels, exclude_labels)
-
+			self.__outputLable()
+			self.canceling = False
+
+class SaveMbox(Gmail):
+	def __init__(self, options, progress):
+		super(SaveMbox, self).__init__(options, progress)
+
+	def __addToMBox(self, label, mail):
+		if label not in self.mboxs:
+			odir = os.path.expanduser(self.options.mbox_export)
+			self.mboxs[label] = mailbox.mbox('%s/%s.mbox' % (odir, label.replace('/', '-'), ), create = True)
+			self.mboxs[label].clear()
+			self.mboxs[label].flush()
+		self.mboxs[label].add(mail)
+
+	def execute(self):
+		date_range = [self.options.start_date, self.options.end_date]		
+		amFilteringDates = (date_range[0], date_range[1]) != (None, None)
+		lfilt = self.get_FilterLabels()
+
+		self.checkDir()
+		self.readLabelFile()
+
+		odir = os.path.expanduser(self.options.mbox_export)
+		if not os.path.exists(odir):
+			os.mkdir(odir)
+
+		ntotal = len(self.mails)
+		self.progress.setRange(0, ntotal, 0)
+		self.progress.setText("Exporting messages to mbox(es) [@value/@max]")
+
+		nsaved = 0
+		for i, m in enumerate(self.mails.values()):
+			if self.canceling:
+			  self.progress.setText('Export was canceled by user.')
+			  self.progress.newLine()
+			  break
+			self.progress.setValue(i + 1)
+			updateLabel = lfilt.filter(m.labels)
+			if len(updateLabel) < 1:
+				continue
+			with open("%s/%s/%s" % (self.options.backup_dir, m.folder, m.hash_value)) as f:
+				mail = f.read()
+				e = email.message_from_string(mail)
+				if amFilteringDates:
+					dateTuple = email.utils.parsedate(e.get('date'))
+					if not self.isInTimeFrame(date_range, dateTuple):
+						continue
+					
+				for label in updateLabel:
+					self.__addToMBox(label, mail)
+				nsaved += 1
+
+		for i, m in enumerate(self.mboxs.values()):
+			m.flush()
+
+		self.progress.setText("Exported %d of %d message(s) to mbox(es)" % (nsaved, ntotal))
+		self.progress.newLine()
+		self.canceling = False
 
 class RestoreGmail(Gmail):
-	def __init__(self, username, password, src, progress):
-		super(RestoreGmail, self).__init__(username, password)
-		self.labels = set(self.fetchLabelNames())
-		self.progress = progress
-		self.src = src
-		self.mails = {}
+	def __init__(self, options, progress):
+		super(RestoreGmail, self).__init__(options, progress)
 
-	def appendMessage(self, message, date, mailbox = None):
-		ret, msg = self.gmail.append(mailbox, None, date, message)
+	def __appendMessage(self, message, date, mailbox = None):
+		utf7mailbox = None
+		if mailbox is not None:
+			utf7mailbox = imapUTF7Encode(mailbox.decode('utf-8'))
+		if isinstance(date, str):
+			if len(date) < 1:
+				date = None
+			elif (date[0],date[-1]) != ('"','"'):
+				date = '"%s"' % date
+		ret, msg = self.gmail.append(utf7mailbox, None, date, message)
+		if ret != 'OK':
+			return ''
 		return re.findall("APPENDUID [0-9]+ ([0-9]+)", msg[0])[0]
 
-	def assignLabel(self, uid, label):
-		#FIXME need support for multi lanugage
-		#if label == "%s/All Mail" % (self.getGmailPrefix(), ): return
+	def __assignLabel(self, uid, label):
+		self.__ensureLabel(label)
+		utf7label = imapUTF7Encode(label.decode('utf-8'))
+		ret, msg = self.gmail.uid('COPY', uid, utf7label)
+	
+	def __ensureLabel(self, label):
 		if label not in self.labels:
-			self.gmail.create(label)
+			utf7label = imapUTF7Encode(label.decode('utf-8'))
+			self.gmail.create(utf7label)
 			self.labels = set(self.fetchLabelNames())
-		ret, msg = self.gmail.uid('COPY', uid, label)
-	
-	def isInTimeFrame(self, date_range, date):
-		if date == None:
-			return True
-		if date_range == None or (date_range[0] == None and date_range[1] == None):
-			return True
-		if date_range[0] == None:
-			end = datetime.strptime(date_range[1], "%d-%b-%Y")
-			return date < end
-		if date_range[1] == None:
-			start = datetime.strptime(date_range[0], "%d-%b-%Y")
-			return start < date 
-		start = datetime.strptime(date_range[0], "%d-%b-%Y")
-		end = datetime.strptime(date_range[1], "%d-%b-%Y")
-		return start < date and date < end
-
-	def restore(self, date_range = None, include_labels = None, exclude_labels = None):
-		with open("%s/label" % (self.src, )) as f:
-			for line in f.readlines():
-				m = MailMetaData.fromStr(line.strip())
-				self.mails[m.id] = m
+
+	def execute(self):
+		date_range = [self.options.start_date, self.options.end_date]		
+		amFilteringDates = (date_range[0], date_range[1]) != (None, None)
+		lfilt = self.get_FilterLabels()
+
+		self.checkDir()
+		self.login()
+
+		# Read label file for messages, but then set self.labels to what
+		# exists on the server. Each message in self.mails will still have 
+		# its private set of labels
+		self.readLabelFile()
+		self.labels = set(self.fetchLabelNames())
+
+		ntotal = len(self.mails)
+		self.progress.setRange(0, ntotal, 0)
+		self.progress.setText("Processing messages for restore [@value/@max]")
 		
-		#FIXME need support for multi lanugage
-		#mail_count = self.selectMailBox('%s/All Mail' % (self.getGmailPrefix(), ))
-		mail_count = self.selectMailBox('INBOX')
+		specials = self.fetchSpecialLabels()
+		inBoxes = [ 'inbox', specials['\\Inbox'].lower() ]
+		if '\\AllMail' not in specials:     # AllMail with no space
+			raise self.ApplicationError('\\AllMail is not IMAP accessible!') 
+		allMail = specials['\\AllMail'] 
+		labelTarget = allMail
+		if self.options.label_target is not None:
+			self.__ensureLabel(self.options.label_target)
+			labelTarget = self.options.label_target
+
+		nrestored = 0
+		mail_count = self.selectMailBox(labelTarget)
 		for i, m in enumerate(self.mails.values()):
-			print "\r%d" % (i), 
-			sys.stdout.flush()
-
-			include = m.labels.intersection(include_labels) if include_labels != None else m.labels
-			exclude = m.labels.intersection(exclude_labels) if exclude_labels != None else set()
-			if include_labels != None and include == set():
-				continue
-			if exclude_labels != None and exclude != set():
-				continue
-			with open("%s/%s/%s" % (self.src, m.folder, m.hash_value)) as f:
+			if self.canceling:
+				self.progress.setText("Restore was canceled by user.")
+				self.progress.newLine()
+				break
+			self.progress.setValue(i + 1)
+			updateLabel = lfilt.filter(m.labels)
+			if len(updateLabel) < 1:
+				continue
+			with open("%s/%s/%s" % (self.options.backup_dir, m.folder, m.hash_value)) as f:
 				mail = f.read()
 				e = email.message_from_string(mail)
-				date = email.utils.parsedate(e.get('date'))
-				if date != None and not self.isInTimeFrame(date_range, datetime(*date[:7])):
-					continue
-				#FIXME need support for multi lanugage
-				#uid = self.appendMessage(mail, date, '%s/All Mail' % (self.getGmailPrefix(), ))
-				uid = self.appendMessage(mail, date, 'INBOX')
-				updateLabel = m.labels.difference(exclude).intersection(include)
-				for label in updateLabel:
-					self.assignLabel(uid, label)
-		print
+				date2822 = e.get('date')
+				if amFilteringDates:
+					dateTuple = email.utils.parsedate(date2822)
+					if not self.isInTimeFrame(date_range, dateTuple):
+						continue
+				uid = self.__appendMessage(mail, date2822, labelTarget)
+				if len(uid) < 1:
+					self.progress.newLine()
+					self.progress.setText("Failed to append %s/%s." % (m.folder, m.hash_value))
+					self.progress.newLine()
+				else:
+					nrestored += 1
+					for label in updateLabel:
+						if label.lower() not in inBoxes and label != allMail:
+							self.__assignLabel(uid, label)
+
+		self.progress.setText("Restored %d of %d message(s)." % (nrestored, ntotal))
+		self.progress.newLine()
+		self.canceling = False
 	
 class TerminalProgress:
 	def __init__(self):
 		self.value = 0
 		self.min = 0
 		self.max = 0
-
-	def setRange(self, a, b):
+		self.maxWidth = 0
+		self.formatter = self.justString
+
+	def justString(self, v):
+		return str(v)
+
+	def setRange(self, a, b, v):
 		self.min = a
 		self.max = b
-		self.update()
+		if v is not None:
+			self.value = v
 
-	def setValue(self, value):
+	def setValue(self, value, noupdate=False):
 		self.value = value
-		self.update()
+		if (not noupdate):
+			self.update()
 
 	def setText(self, t):
 		self.text = t
@@ -454,111 +686,188 @@
 	
 	def update(self):
 		x = self.text
-		x = x.replace('@value', str(self.value))
-		x = x.replace('@max', str(self.max))
-		print '\r%s' % (x, ),
+		x = x.replace('@value', self.formatter(self.value))
+		x = x.replace('@max', self.formatter(self.max))
+		xlen = len(x)
+		if xlen < self.maxWidth:
+			x = x + ' ' * (self.maxWidth - xlen)
+		else:
+			self.maxWidth = xlen
+		print '\r%s\r' % (x, ),
 		sys.stdout.flush()
+		
+	def newLine(self):
+		self.maxWidth = 0
+		print 
+
+class GmailDate:
+	GMAIL_DFMT = '%d-%b-%Y'  # i.e., dd-MMM-yyyy
+	POSIX_MONTHS = [None, 'Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec']
+
+	@classmethod
+	def toLocal(cls, gmail_date, format=GMAIL_DFMT):
+		dd, pMMM, yyyy = gmail_date.split('-', 3)
+		iMMM = cls.POSIX_MONTHS.index(pMMM)
+		pdate = date(int(yyyy), iMMM, int(dd))
+		return pdate.strftime(cls.GMAIL_DFMT)
+
+	@classmethod
+	def fromLocal(cls, date_string, format=GMAIL_DFMT):
+		d = datetime.strptime(date_string, format)
+		return '%02d-%s-%04d' % (d.day, cls.POSIX_MONTHS[d.month], d.year)
+
+class KeyringUtil:
+	def __init__(self, service_template):
+		self.service_template = service_template
+		try:
+			import keyring
+		except ImportError:
+			print >> sys.stderr, 'WARNING: keyring for secure passwords is not configured'
+			self.get_password_function = self.__noop_get_password
+			self.set_password_function = self.__noop_set_password
+		else:
+			self.get_password_function = keyring.get_password
+			self.set_password_function = keyring.set_password
+
+	def get_password(self, username):
+		servicename = self.service_template % (username, )
+		return self.get_password_function(servicename, username)
+
+	def set_password(self, username, password):
+		servicename = self.service_template % (username, )
+		self.set_password_function(servicename, username, password)
+
+	def __noop_get_password(self, servicename, username):
+		return None
+
+	def __noop_set_password(self, servicename, username, password):
+		return
 
 def loadConfigFile(options, filename):
 	config = ConfigParser.SafeConfigParser()
 	config.read([filename, os.path.expanduser('~/.backup_gmail.cfg')])
+	keyu = KeyringUtil(KC_SERVICE_TEMPLATE)
 	result = {}
 	for section in config.sections():
-		result[section] = copy.copy(options)
-		result[section].username = config.get(section, 'username')
-		result[section].password = config.get(section, 'password')
-		result[section].backup_dir = config.get(section, 'backup_dir')
+		rsec = result[section] = copy.copy(options)
+		rsec.username = config.get(section, 'username')
+		rsec.backup_dir = config.get(section, 'backup_dir')
 		if config.has_option(section, 'keep_read'):
-			result[section].keep_read = config.getboolean(section, 'keep_read')
-		if config.has_option(section, 'incremental'):
-			result[section].incremental = config.getboolean(section, 'incremental')
+			rsec.keep_read = config.getboolean(section, 'keep_read')
 		if config.has_option(section, 'start_date'):
-			result[section].start_date = config.get(section, 'start_date')
+			rsec.start_date = config.get(section, 'start_date')
 		if config.has_option(section, 'end_date'):
-			result[section].end_date = config.get(section, 'end_date')
+			rsec.end_date = config.get(section, 'end_date')
 		if config.has_option(section, 'include_labels'):
-			result[section].include_labels = config.get(section, 'include_labels')
+			rsec.include_labels = config.get(section, 'include_labels')
 		if config.has_option(section, 'exclude_labels'):
-			result[section].exclude_labels = config.get(section, 'exclude_labels')
+			rsec.exclude_labels = config.get(section, 'exclude_labels')
+		if config.has_option(section, 'mbox_export'):
+			rsec.mbox_export = config.get(section, 'mbox_export')
+		if config.has_option(section, 'strict_exclude'):
+			rsec.strict_exclude = config.getboolean(section, 'strict_exclude')
+		if config.has_option(section, 'match_regex'):
+			rsec.match_regex = config.get(section, 'match_regex')
+		if rsec.username is not None and len(rsec.username):
+			rsec.password = keyu.get_password(rsec.username)
+		if rsec.password is None and config.has_option(section, 'password'):
+			rsec.password = config.get(section, 'password')
 	return result
 
 def saveConfigFile(profiles, filename):
 	def set_helper(cfg, section, option, value):
 		if value == None:
 			return
-		return cfg.set(section, option, str(value))
+		return cfg.set(section, option, value)
+	keyu = KeyringUtil(KC_SERVICE_TEMPLATE)
 	config = ConfigParser.SafeConfigParser()
 	for section in profiles:
 		p = profiles[section]
 		config.add_section(section)
 		set_helper(config, section, 'username', p.username)
-		set_helper(config, section, 'password', p.password)
 		set_helper(config, section, 'backup_dir', p.backup_dir)
-		set_helper(config, section, 'keep_read', p.keep_read)
-		set_helper(config, section, 'incremental', p.incremental)
+		set_helper(config, section, 'keep_read', str(p.keep_read))
 		set_helper(config, section, 'start_date', p.start_date)
 		set_helper(config, section, 'end_date', p.end_date)
 		set_helper(config, section, 'include_labels', p.include_labels)
 		set_helper(config, section, 'exclude_labels', p.exclude_labels)
+		set_helper(config, section, 'mbox_export', p.mbox_export)
+		set_helper(config, section, 'strict_exclude', str(p.strict_exclude))
+		set_helper(config, section, 'match_regex', p.match_regex)
+		if p.password is not None and len(p.password):
+			if p.username is not None and len(p.username):
+				keyu.set_password(p.username, p.password)
 	with open(filename, 'w') as f:
 		config.write(f)
 
 def getOptionParser():
-	parser = optparse.OptionParser(usage = "%prog backup_dir email@address password")
-	parser.add_option("-r", "--restore", dest="restore", action="store_true", default = False, help = "Restore backup to online gmail account")
-	parser.add_option("-i", "--inc", dest="incremental", action="store_true", default = False, help = "Use incremental backup")
-	parser.add_option("-k", "--keep_status", dest="keep_read", action="store_true", default = False, help = "Keep the mail read status (Slow)")
-	parser.add_option("-s", "--start", dest="start_date", action="store", help = "Backup mail starting from this date. Format: 30-Jan-2010")
-	parser.add_option("-e", "--end", dest="end_date", action="store", help = "Backup mail until to this date Format: 30-Jan-2010")
-	parser.add_option("--include", dest="include_labels", action="store", help = "Only backup these labels. Seperate labels by '^' Format: label1^label2")
-	parser.add_option("--exclude", dest="exclude_labels", action="store", help = "Do not backup these labels. If --include is used this flag will be ignored. Seperate labels by '^' Format: label1^label2")
+	parser = optparse.OptionParser(usage = "%prog [options] [backup_dir email@address password]")
+	parser.add_option("--dest", dest="backup_dir", action="store", help="Backup destination")
+	parser.add_option("--user", dest="username", action="store", help = "Gmail email@address")
+	parser.add_option("--password", dest="password", action="store", help = "Gmail password")
+	parser.add_option("-P", "--prompt", dest="prompt", action="store_true", default = False, help = "Prompt for Gmail credentials")
+	parser.add_option("-r", "--restore", dest="restore", action="store_true", default = False, help = "Restore backup to gmail (see --label)")
+	parser.add_option("-m", "--mbox_export", dest="mbox_export", action="store", help = "Save mbox(es) to directory")
+	parser.add_option("-k", "--keep_status", dest="keep_read", action="store_true", default = False, help = "Keep the mail read status")
+	parser.add_option("-s", "--start", dest="start_date", action="store", 
+		help = "Process mail starting from this date (inclusive SINCE). Format: dd-MMM-yyyy in user's locale")
+	parser.add_option("-e", "--end", dest="end_date", action="store", 
+		help = "Process mail until this date (exclusive BEFORE). Format: dd-MMM-yyyy in user's locale")
+	parser.add_option("--include", dest="include_labels", action="store", 
+		help = "Only process these labels. Separate by '^' Format: label1^label2")
+	parser.add_option("--exclude", dest="exclude_labels", action="store", 
+		help = "Do not process these labels. Separate by '^' Format: label1^label2")
+	parser.add_option("--strict_exclude", dest="strict_exclude", action="store_true", default = False, 
+		help = "Backup: exclude also by message-id; Restore/Save: exclude completely if labeled")
+	parser.add_option("--match", dest="match_regex", action="store", 
+		help = "Match labels to process by regex")
+	parser.add_option("-l", "--label", dest="label_target", action="store", help = "Restore also to specified label")
 	parser.add_option("-c", "--config", dest="config_file", action="store", help = "Load setting from config file")
 	parser.add_option("-p", "--profile", dest="profile", action="store", default = "Main", help = "Use this profile in the config file.")
 	return parser
 
-def doBackup(options, progress, overwrite = False):
-	include_labels = exclude_labels = None
-	if options.include_labels != None:
-		include_labels = options.include_labels.split('^')
-	if options.exclude_labels != None:
-		exclude_labels = options.exclude_labels.split('^')
-	
-	backup = BackupGmail(options.username, options.password, options.backup_dir, progress)
-	backup.keep_read_status = options.keep_read
-	if options.incremental:
-		backup.incrementalBackupTo([options.start_date, options.end_date], include_labels, exclude_labels)
-	else:
-		backup.backupTo([options.start_date, options.end_date], overwrite, include_labels, exclude_labels)
-
-def doRestore(options, progress, dummy = False):
-	include_labels = exclude_labels = None
-	if options.include_labels != None:
-		include_labels = options.include_labels.split('^')
-	if options.exclude_labels != None:
-		exclude_labels = options.exclude_labels.split('^')
-	
-	restore = RestoreGmail(options.username, options.password, options.backup_dir, progress)
-	restore.restore([options.start_date, options.end_date], include_labels, exclude_labels)
-
 if __name__ == '__main__':
+	locale.setlocale(locale.LC_TIME, '')
 	parser = getOptionParser()
 	(options, args) = parser.parse_args()
-
-	if len(args) < 3 and options.config_file == None:
-		parser.print_help()
-		exit()
-
+	
 	if options.config_file != None:
 		options = loadConfigFile(options, options.config_file)[options.profile]
-	else:
-		options.backup_dir= args[0]
+
+	if len(args) >= 1:
+		options.backup_dir = args[0]
+	elif options.backup_dir is None:
+		parser.print_help()
+		exit()
+
+	if len(args) >= 2:
 		options.username = args[1]
+	if len(args) >= 3:
 		options.password = args[2]
+
+	if options.prompt:
+		import getpass
+		options.username = raw_input('Username: ')
+		options.password = getpass.getpass()
+		
+	canConnect = (options.username is not None and options.password is not None)
+	if options.mbox_export is None and canConnect == False:
+		parser.print_help()
+		exit()
+		
 	try:
-		if options.restore == True:
-			doRestore(options, TerminalProgress())
+		if canConnect == False:
+			pass
+		elif options.restore == True:
+			grestore = RestoreGmail(options, TerminalProgress())
+			grestore.execute()
 		else:
-			doBackup(options, TerminalProgress())
+			gbackup = BackupGmail(options, TerminalProgress())
+			gbackup.execute()
+			
+		if options.mbox_export is not None:
+			gmbox = SaveMbox(options, TerminalProgress())
+			gmbox.execute()
 	except Exception as e:
 		traceback.print_exc(e)
 		exit()

=== modified file 'gui.py'
--- gui.py	2011-04-14 02:17:02 +0000
+++ gui.py	2016-09-30 23:55:37 +0000
@@ -6,7 +6,9 @@
 """
  
 import sys
+import locale
 import traceback
+from datetime import datetime, date
 from PySide.QtCore import *
 from PySide.QtGui import *
 
@@ -14,15 +16,13 @@
 
 def getGuiOptionParser():
 	parser = backup_gmail.getOptionParser()
-	parser.add_option("--user", dest="username", action="store", help = "Gmail account name")
-	parser.add_option("--password", dest="password", action="store", help = "Gmail account password")
-	parser.add_option("--dest", dest="backup_dir", action="store", help = "Backup destination")
 	return parser
  
 class MainWindow(QMainWindow):
 	def __init__(self, parent=None):
 		super(MainWindow, self).__init__(parent)
 		self.setWindowTitle("Backup Gmail")
+		self.setMinimumSize(640, 0)
 
 		self.config_label = QLabel("Profile:")
 		self.config_select = QComboBox()
@@ -44,8 +44,8 @@
 		self.backup_path = QLineEdit()
 		self.backup_path_btn = QPushButton("Select")
 
-		self.keep_read = QCheckBox("Keep read/unread (Slow)")
-		self.inc = QCheckBox("Incremental Backup")
+		self.keep_read = QCheckBox("Keep the mail read status")
+		self.keep_read.setChecked(True)
 
 		self.start_date_label = QLabel("From:")
 		self.start_date = QDateEdit()
@@ -63,12 +63,21 @@
 		self.end_date_enable = QCheckBox("Enable")
 		self.end_date_enable.stateChanged.connect(self.end_date.setEnabled)
 
-		self.label_filter_label = QLabel("Label Filter:")
+		self.label_filter_label = QLabel("Label(s) Filter:")
 		self.include_label = QRadioButton("Include")
 		self.include_label.setChecked(True)
 		self.exclude_label = QRadioButton("Exclude")
+		self.strict_exclude = QRadioButton("Exclude (Strict)")
 		self.label_filter_text = QLineEdit()
-		self.label_filter_text.setPlaceholderText("Keep empty to fetch all labels")
+		self.label_filter_text.setPlaceholderText("Optional; separate by '^'")
+		
+		self.label_regex_label = QLabel("Label Regex:")
+		self.label_regex_text = QLineEdit()
+		self.label_regex_text.setPlaceholderText("Optional")
+
+		self.label_target_label = QLabel("Restore also to:")
+		self.label_target_text = QLineEdit()
+		self.label_target_text.setPlaceholderText("Optional label")
 
 		self.load_config_btn = QPushButton("Load Config")        
 		self.store_config_btn = QPushButton("Save Config")        
@@ -100,12 +109,18 @@
 		vTmp = QVBoxLayout()
 		vTmp.addWidget(self.include_label)
 		vTmp.addWidget(self.exclude_label)
+		vTmp.addWidget(self.strict_exclude)
 		layout.addLayout(vTmp, 5, 2)
-
-		layout.addWidget(self.backup_label, 6, 0)
-		layout.addWidget(self.backup_path, 6, 1)
-		layout.addWidget(self.backup_path_btn, 6, 2)
-
+		
+		layout.addWidget(self.label_regex_label, 6, 0)
+		layout.addWidget(self.label_regex_text, 6, 1)
+
+		layout.addWidget(self.backup_label, 7, 0)
+		layout.addWidget(self.backup_path, 7, 1)
+		layout.addWidget(self.backup_path_btn, 7, 2)
+
+		layout.addWidget(self.label_target_label, 8, 0)
+		layout.addWidget(self.label_target_text, 8, 1)
 
 		btnLayout = QHBoxLayout()
 		btnLayout.addWidget(self.load_config_btn)
@@ -115,7 +130,6 @@
 		
 		checkLayout = QHBoxLayout()
 		checkLayout.addWidget(self.keep_read)
-		checkLayout.addWidget(self.inc)
 
 		vLayout.addLayout(layout)
 		vLayout.addLayout(checkLayout)
@@ -160,58 +174,86 @@
 			self.current_profile = text
 
 	def setUI(self, options):
-		self.user_text.setText(options.username)
-		self.pass_text.setText(options.password)
-		self.backup_path.setText(options.backup_dir)
+		if options.username is not None:
+			self.user_text.setText(options.username.decode('utf-8'))
+		else:
+			self.user_text.clear()
+		if options.password is not None:
+			self.pass_text.setText(options.password.decode('utf-8'))
+		else:
+			self.pass_text.clear()
+		if options.backup_dir is not None:
+			self.backup_path.setText(options.backup_dir.decode('utf-8'))
+		else:
+			self.backup_path.clear()
 
 		self.keep_read.setChecked(options.keep_read == True)
-		self.inc.setChecked(options.incremental == True)
 
 		if options.start_date != None:
+			sdate = QDate.fromString(options.start_date.decode('utf-8'), "dd-MMM-yyyy")
 			self.start_date_enable.setChecked(True)
-			self.start_date.setDate(QDate.fromString(options.start_date, "dd-MMM-yyyy"))
+			self.start_date.setDate(sdate)
 		else:
 			self.start_date_enable.setChecked(False)
 		
 		if options.end_date != None:
+			# options.end_date is exclusive, but UI is inclusive, so subtract 1 day
+			edate = QDate.fromString(options.end_date.decode('utf-8'), "dd-MMM-yyyy").addDays(-1)
 			self.end_date_enable.setChecked(True)
-			self.end_date.setDate(QDate.fromString(options.end_date, "dd-MMM-yyyy"))
+			self.end_date.setDate(edate)
 		else:
 			self.end_date_enable.setChecked(False)
 
 		if options.include_labels != None:
 			self.include_label.setChecked(True)
-			self.label_filter_text.setText(options.include_labels)
+			self.label_filter_text.setText(options.include_labels.decode('utf-8'))
 		elif options.exclude_labels != None:
-			self.exclude_label.setChecked(True)
-			self.label_filter_text.setText(options.exclude_labels)
+		  if options.strict_exclude:
+		    self.strict_exclude.setChecked(True)
+		  else:
+			  self.exclude_label.setChecked(True)
+		  self.label_filter_text.setText(options.exclude_labels.decode('utf-8'))
 		else:
 			self.label_filter_text.setText("")
+			
+		if options.match_regex is not None:
+			self.label_regex_text.setText(options.match_regex.decode('utf-8'))
+		else:
+			self.label_regex_text.setText("")
 
 	def saveUI(self, options):
-		options.username = self.user_text.text()
-		options.password = self.pass_text.text()
-		options.backup_dir = self.backup_path.text()
+		options.username = self.user_text.text().encode('utf-8')
+		options.password = self.pass_text.text().encode('utf-8')
+		options.backup_dir = self.backup_path.text().encode('utf-8')
 		options.keep_read = self.keep_read.isChecked()
-		options.incremental = self.inc.isChecked()
+
 		if self.start_date_enable.isChecked():
-			options.start_date = self.start_date.date().toString("dd-MMM-yyyy")
+			options.start_date = self.start_date.date().toString("dd-MMM-yyyy").encode('utf-8')
 		else:
 			options.start_date = None
 		
 		if self.end_date_enable.isChecked():
-			options.end_date = self.end_date.date().toString("dd-MMM-yyyy")
+			# options.end_date is exclusive, so add 1 day
+			options.end_date = self.end_date.date().addDays(1).toString("dd-MMM-yyyy").encode('utf-8')
 		else:
 			options.end_date = None
 		
+		options.include_labels = None
+		options.exclude_labels = None
 		if self.label_filter_text.text() != '':
 			if self.include_label.isChecked():
-				options.include_labels = self.label_filter_text.text()
+				options.include_labels = self.label_filter_text.text().encode('utf-8')
 			else:
-				options.exclude_labels = self.label_filter_text.text()
-		else:
-			options.include_labels = None
-			options.exclude_labels = None
+				options.exclude_labels = self.label_filter_text.text().encode('utf-8')
+				options.strict_exclude = self.strict_exclude.isChecked()
+		
+		options.match_regex = None
+		if self.label_regex_text.text() != '':
+			options.match_regex = self.label_regex_text.text().encode('utf-8')
+
+		options.label_target = None
+		if self.label_target_text.text() != '':
+			options.label_target = self.label_target_text.text().encode('utf-8')
 
 	def storeConfig(self):
 		name = QFileDialog.getSaveFileName(self, "Open File", ".", "Config (*.cfg)")
@@ -234,7 +276,7 @@
 			for section in result:
 				self.config_select.addItem(section)
 			self.current_profile = self.config_select.itemText(0)
-			self.setUI(result[self.config_select.itemText(0)])
+			self.setUI(result[self.current_profile])
 			self.config_file = result
 
 	def backup(self):
@@ -246,80 +288,89 @@
 		self.restore_btn.setDisabled(True)
 		self.backup_btn.setDisabled(True)
 		
-		self.t = BackupRestoreThread(backup_gmail.doBackup, self.config_file[self.current_profile])
+		self.progress = QProgressDialog(self)
+		self.progress.setAutoClose(False)
+		self.progress.setWindowModality(Qt.WindowModal)
+		self.progress.setWindowTitle("Backup from %s" % (self.user_text.text(), ))
+		self.progress.setLabelText(" " * 100)
+		self.progress.canceled.connect(self.cancel_operation)
+
+		self.t = BackupRestoreThread(self.getBackerup, self.config_file[self.current_profile])
 		self.t.finished.connect(self.backup_restore_finished)
 		self.t.error.connect(self.show_error)
 		self.t.backup_success.connect(self.show_backup_success)
-		self.t.start()
+
 		self.timer = QTimer(self)
 		self.timer.timeout.connect(self.update_progress)
+
+		self.t.start()
 		self.timer.start(1000)
-
-		self.progress = QProgressDialog(self)
-		self.progress.setAutoClose(False)
-		self.progress.setWindowModality(Qt.WindowModal)
-		self.progress.setWindowTitle("Backup from %s" % (self.user_text.text(), ))
-		self.progress.setLabelText(" " * 100)
 		self.progress.show()
 	
+	def getBackerup(self, options, progress):
+		return backup_gmail.BackupGmail(options, progress)
+	
 	def restore(self):
 		self.restore_btn.setDisabled(True)
 		self.backup_btn.setDisabled(True)
 		self.saveUI(self.config_file[self.current_profile])
-		self.t = BackupRestoreThread(backup_gmail.doRestore, self.config_file[self.current_profile])
+
+		self.progress = QProgressDialog(self)
+		self.progress.setAutoClose(False)
+		self.progress.setWindowModality(Qt.WindowModal)
+		self.progress.setWindowTitle("Restore to %s" % (self.user_text.text(), ))
+		self.progress.setLabelText(" " * 100)
+		self.progress.canceled.connect(self.cancel_operation)
+
+		self.t = BackupRestoreThread(self.getRestorer, self.config_file[self.current_profile])
 		self.t.finished.connect(self.backup_restore_finished)
 		self.t.error.connect(self.show_error)
 		self.t.backup_success.connect(self.show_restore_success)
-		self.t.start()
+
 		self.timer = QTimer(self)
 		self.timer.timeout.connect(self.update_progress)
+
+		self.t.start()
 		self.timer.start(1000)
-
-		self.progress = QProgressDialog(self)
-		self.progress.setAutoClose(False)
-		self.progress.setWindowModality(Qt.WindowModal)
-		self.progress.setWindowTitle("Restore to %s" % (self.user_text.text(), ))
-		self.progress.setLabelText(" " * 100)
 		self.progress.show()
+		
+	def getRestorer(self, options, progress):
+		return backup_gmail.RestoreGmail(options, progress)
+		
+	def cancel_operation(self):
+		if self.t.gobj is not None:
+			self.t.gobj.cancel()
 
 	def show_error(self, message):
 		msgBox = QMessageBox()
-		msgBox.setWindowTitle("Error")
-		msgBox.setIcon(QMessageBox.Critical)
-		msgBox.setText(message)
-		msgBox.exec_()
-	
-	def show_password_error(self):
-		msgBox = QMessageBox()
-		msgBox.setWindowTitle("Error")
-		msgBox.setIcon(QMessageBox.Critical)
-		msgBox.setText("username or password incorrect")
-		msgBox.exec_()
-	
-	def show_backup_success(self):
-		msgBox = QMessageBox()
-		msgBox.setWindowTitle("Success")
-		msgBox.setIcon(QMessageBox.Information)
-		msgBox.setText("Backup success")
-		msgBox.exec_()
-	
-	def show_restore_success(self):
-		msgBox = QMessageBox()
-		msgBox.setWindowTitle("Success")
-		msgBox.setIcon(QMessageBox.Information)
-		msgBox.setText("Restore success")
+		msgBox.setText("An error has occurred.")
+		msgBox.setIcon(QMessageBox.Critical)
+		msgBox.setInformativeText(message)
+		msgBox.exec_()
+	
+	def show_backup_success(self, progress):
+		msgBox = QMessageBox()
+		msgBox.setText("The backup finished with no errors.")
+		msgBox.setIcon(QMessageBox.Information)
+		msgBox.setInformativeText(progress)
+		msgBox.exec_()
+	
+	def show_restore_success(self, progress):
+		msgBox = QMessageBox()
+		msgBox.setText("The restore finished with no errors.")
+		msgBox.setIcon(QMessageBox.Information)
+		msgBox.setInformativeText(progress)
 		msgBox.exec_()
 
 	def backup_restore_finished(self):
 		self.restore_btn.setDisabled(False)
 		self.backup_btn.setDisabled(False)
-
 		self.progress.close()
 
 	def update_progress(self):
 		self.progress.setRange(self.t.prog.min, self.t.prog.max)
 		self.progress.setValue(self.t.prog.value)
-		self.progress.setLabelText(self.t.prog.getText())
+		self.progress.setLabelText(self.t.prog.getText().decode('utf-8'))
 
 class GuiProgress:
 	def __init__(self):
@@ -327,42 +378,59 @@
 		self.max = 1000
 		self.value = 0
 		self.text = ""
+		self.lines = []
+		self.formatter = self.justString
 
-	def setRange(self, a, b):
+	def setRange(self, a, b, v):
 		self.min = a
-		self.max = b / 1000.0
+		self.max = b
+		if v is not None:
+			self.value = v
 
 	def setValue(self, value):
-		self.value = value / 1000.0
+		self.value = value
 
 	def setText(self, text):
 		self.text = text
 
+	def newLine(self):
+		self.lines.append(self.getText())
+		return
+
+	def getLines(self):
+		return self.lines
+
+	def justString(self, value):
+		return str(value)
+
 	def getText(self):
-		tmp = self.text.replace("@max", str(self.max))
-		tmp = tmp.replace("@min", str(self.min))
-		tmp = tmp.replace("@value", str(self.value))
+		tmp = self.text.replace("@max", self.formatter(self.max))
+		tmp = tmp.replace("@min", self.formatter(self.min))
+		tmp = tmp.replace("@value", self.formatter(self.value))
 		return tmp
 
 class BackupRestoreThread(QThread):
 	error = Signal(str)
-	backup_success = Signal()
+	backup_success = Signal(str)
 	def __init__(self, func, options, parent=None):
 		super(BackupRestoreThread, self).__init__(parent)
 		self.func = func
 		self.options = options
 		self.prog = GuiProgress()
+		self.gobj = None
 
 	def run(self):
 		try:
-			self.func(self.options, self.prog, True)
+			self.gobj = self.func(self.options, self.prog)
+			self.gobj.execute()
 		except Exception as e:
 			traceback.print_exc(e)
 			self.error.emit(e.__str__())
 			return
-		self.backup_success.emit()
+		self.backup_success.emit('\n'.join(self.prog.getLines()).decode('utf-8'))
 
 if __name__ == '__main__':
+	locale.setlocale(locale.LC_TIME, '')
 	app = QApplication(sys.argv)
 	main = MainWindow()
 	main.show()

=== added file 'imapUTF7.py'
--- imapUTF7.py	1970-01-01 00:00:00 +0000
+++ imapUTF7.py	2016-09-30 23:55:37 +0000
@@ -0,0 +1,210 @@
+# -*- coding: iso-8859-1 -*-
+# Used with permission; See 
+# http://mxm-mad-science.blogspot.com/2008/03/python-unicode-lessons-from-school-of.html
+# http://svn.plone.org/svn/collective/mxmImapClient/trunk/imapUTF7.py
+
+"""
+Imap folder names are encoded using a special version of utf-7 as defined in RFC 
+2060 section 5.1.3.
+
+5.1.3.  Mailbox International Naming Convention
+
+   By convention, international mailbox names are specified using a
+   modified version of the UTF-7 encoding described in [UTF-7].  The
+   purpose of these modifications is to correct the following problems
+   with UTF-7:
+
+      1) UTF-7 uses the "+" character for shifting; this conflicts with
+         the common use of "+" in mailbox names, in particular USENET
+         newsgroup names.
+
+      2) UTF-7's encoding is BASE64 which uses the "/" character; this
+         conflicts with the use of "/" as a popular hierarchy delimiter.
+
+      3) UTF-7 prohibits the unencoded usage of "\"; this conflicts with
+         the use of "\" as a popular hierarchy delimiter.
+
+      4) UTF-7 prohibits the unencoded usage of "~"; this conflicts with
+         the use of "~" in some servers as a home directory indicator.
+
+      5) UTF-7 permits multiple alternate forms to represent the same
+         string; in particular, printable US-ASCII chararacters can be
+         represented in encoded form.
+
+   In modified UTF-7, printable US-ASCII characters except for "&"
+   represent themselves; that is, characters with octet values 0x20-0x25
+   and 0x27-0x7e.  The character "&" (0x26) is represented by the two-
+   octet sequence "&-".
+
+   All other characters (octet values 0x00-0x1f, 0x7f-0xff, and all
+   Unicode 16-bit octets) are represented in modified BASE64, with a
+   further modification from [UTF-7] that "," is used instead of "/".
+   Modified BASE64 MUST NOT be used to represent any printing US-ASCII
+   character which can represent itself.
+
+   "&" is used to shift to modified BASE64 and "-" to shift back to US-
+   ASCII.  All names start in US-ASCII, and MUST end in US-ASCII (that
+   is, a name that ends with a Unicode 16-bit octet MUST end with a "-
+   ").
+
+      For example, here is a mailbox name which mixes English, Japanese,
+      and Chinese text: ~peter/mail/&ZeVnLIqe-/&U,BTFw-
+
+"""
+import binascii
+import codecs
+
+# encoding
+
+def modified_base64(s):
+    s = s.encode('utf-16be')
+    return binascii.b2a_base64(s).rstrip('\n=').replace('/', ',')
+
+def doB64(_in, r):
+    if _in:
+        r.append('&%s-' % modified_base64(''.join(_in)))
+        del _in[:]
+
+def encoder(s):
+    r = []
+    _in = []
+    for c in s:
+        ordC = ord(c)
+        if 0x20 <= ordC <= 0x25 or 0x27 <= ordC <= 0x7e:
+            doB64(_in, r)
+            r.append(c)
+        elif c == '&':
+            doB64(_in, r)
+            r.append('&-')
+        else:
+            _in.append(c)
+    doB64(_in, r)
+    return (str(''.join(r)), len(s))
+
+
+# decoding
+
+def modified_unbase64(s):
+    b = binascii.a2b_base64(s.replace(',', '/') + '===')
+    return unicode(b, 'utf-16be')
+
+
+def decoder(s):
+    r = []
+    decode = []
+    for c in s:
+        if c == '&' and not decode:
+            decode.append('&')
+        elif c == '-' and decode:
+            if len(decode) == 1:
+                r.append('&')
+            else:
+                r.append(modified_unbase64(''.join(decode[1:])))
+            decode = []
+        elif decode:
+            decode.append(c)
+        else:
+            r.append(c)
+    if decode:
+        r.append(modified_unbase64(''.join(decode[1:])))
+    bin_str = ''.join(r)
+    return (bin_str, len(s))
+
+
+class StreamReader(codecs.StreamReader):
+    def decode(self, s, errors='strict'):
+        return decoder(s)
+
+
+class StreamWriter(codecs.StreamWriter):
+    def decode(self, s, errors='strict'):
+        return encoder(s)
+
+
+def imap4_utf_7(name):
+    if name == 'imap4-utf-7':
+        return (encoder, decoder, StreamReader, StreamWriter)
+codecs.register(imap4_utf_7)
+
+
+## testing methods
+
+def imapUTF7Encode(ust):
+    "Returns imap utf-7 encoded version of string"
+    return ust.encode('imap4-utf-7')
+
+def imapUTF7EncodeSequence(seq):
+    "Returns imap utf-7 encoded version of strings in sequence"
+    return [imapUTF7Encode(itm) for itm in seq]
+
+
+def imapUTF7Decode(st):
+    "Returns utf7 encoded version of imap utf-7 string"
+    return st.decode('imap4-utf-7')
+
+def imapUTF7DecodeSequence(seq):
+    "Returns utf7 encoded version of imap utf-7 strings in sequence"
+    return [imapUTF7Decode(itm) for itm in seq]
+
+
+def utf8Decode(st):
+    "Returns utf7 encoded version of imap utf-7 string"
+    return st.decode('utf-8')
+
+
+def utf7SequenceToUTF8(seq):
+    "Returns utf7 encoded version of imap utf-7 strings in sequence"
+    return [itm.decode('imap4-utf-7').encode('utf-8') for itm in seq]
+
+
+__all__ = ['imapUTF7Encode', 'imapUTF7Decode', ]
+
+if __name__=='__main__':
+
+##    print u'bøx'.encode('imap4-utf-7')
+##    print 'expected b&APg-x'
+##
+##    print u'båx'.encode('imap4-utf-7')
+##    print 'expected b&AOU-x'
+##
+    print '#######'
+    print 'bøx'
+    e = imapUTF7Encode(u'bøx')
+    print e
+    print imapUTF7Decode(e).encode('utf-8')
+
+    print '#######'
+    print 'båx'
+    e = imapUTF7Encode(u'båx')
+    print e
+    print imapUTF7Decode(e).encode('utf-8')
+
+    print '#######'
+    print '~/bågø'
+    e = imapUTF7Encode(u'~/bågø')
+    print e
+    print imapUTF7Decode(e).encode('utf-8')
+
+    print '#######'
+    print 'Ting & Såger'
+    e = imapUTF7Encode(u'Ting & Såger')
+    print e
+    print imapUTF7Decode(e).encode('utf-8')
+
+##    e = imapUTF7Decode('b&AOU-x')
+##    print e.encode('latin-1')
+##
+##    e = imapUTF7Decode('b&APg-x')
+##    print e.encode('latin-1')
+##
+    print '#######'
+    print '~/Følder/mailbåx & stuff + more'
+    n = u'~/Følder/mailbåx & stuff + more'
+    e = imapUTF7Encode(n)
+    print e
+    print imapUTF7Decode(e).encode('utf-8')
+
+    print '#######'
+    print '~peter/mail/&ZeVnLIqe-/&U,BTFw-'
+    print imapUTF7Decode('~peter/mail/&ZeVnLIqe-/&U,BTFw-').encode('utf-8')
+    
\ No newline at end of file