Lots has been changed here.  See the bug report
<http://redmine.yorba.org/issues/6230> for some of the discussion about
it.

This also fixes #6274.  I'll cut the list of revisions off after a
while, because this branch has been outstanding for a couple weeks.

Squashed commit of the following:

commit ae505d89e87e63e0d8949bfd901913706a9d3b73
Merge: 81ef002 e18bef96
Author: Charles Lindsay <chaz@yorba.org>
Date:   Thu Jan 31 15:16:17 2013 -0800

    Merge branch 'master' into multiple-accounts

commit 81ef002f5ff486b9c28f5663a0ba1e7392b8489c
Author: Charles Lindsay <chaz@yorba.org>
Date:   Thu Jan 31 15:15:51 2013 -0800

    Fix final round of code review

commit 6935b1e7892b9b356bf5006b89e0b2a4e6a8ad16
Merge: c9ed434 a9dc52b6
Author: Charles Lindsay <chaz@yorba.org>
Date:   Thu Jan 31 14:45:46 2013 -0800

    Merge branch 'master' into multiple-accounts

commit c9ed434fe936e6aed735baef222ae615364c2513
Author: Charles Lindsay <chaz@yorba.org>
Date:   Thu Jan 31 14:31:02 2013 -0800

    Simplify folder comparator

commit 28ac020cfd9135c6eb4ed05574c82b92f99c4a40
Author: Charles Lindsay <chaz@yorba.org>
Date:   Thu Jan 31 14:06:55 2013 -0800

    Bump up declaration to conform to guidelines

commit 0a8167bdaebd5fac1c3ca791de5f2cc233c13cb9
Author: Charles Lindsay <chaz@yorba.org>
Date:   Thu Jan 31 13:54:03 2013 -0800

    Rename back to list_*folders

commit 31457f60298052bdddba8e426db27f93d7c72529
Author: Charles Lindsay <chaz@yorba.org>
Date:   Thu Jan 31 12:36:15 2013 -0800

    Fix spacing, brevity issues

commit ecd30c203d80c21c1ca1234b8911b57efcb68294
Author: Charles Lindsay <chaz@yorba.org>
Date:   Wed Jan 30 17:56:29 2013 -0800

    Fix nits before review

commit 85b51d71e83115991cd9a54d491b4d45b71f2f9b
Merge: b29abce d538bf00
Author: Charles Lindsay <chaz@yorba.org>
Date:   Wed Jan 30 17:46:19 2013 -0800

    Merge branch 'master' into multiple-accounts

commit b29abceeaea84f226ab9bcd22266a511691d8005
Author: Charles Lindsay <chaz@yorba.org>
Date:   Wed Jan 30 17:22:28 2013 -0800

    Fix notifications

commit c26d975fb0859d807ddb7f7c10632605c3b6fb1c
Author: Charles Lindsay <chaz@yorba.org>
Date:   Wed Jan 30 13:01:03 2013 -0800

    Only show current acct. folders in copy/move menus

commit 9a5b57db1229a079f11f518c53f5762a3670b83f
Author: Charles Lindsay <chaz@yorba.org>
Date:   Wed Jan 30 11:48:05 2013 -0800

    Fix issue where wrong mail would show in folders

commit 3b05d18843584c2aff7472708eea30ce24068043
Author: Charles Lindsay <chaz@yorba.org>
Date:   Wed Jan 30 11:18:38 2013 -0800

    Fix ordering of folders in side bar

commit b228967b6a74c16698d593e53e65d66c69ffb974
Author: Charles Lindsay <chaz@yorba.org>
Date:   Wed Jan 30 11:07:32 2013 -0800

    Add icon to accounts in sidebar

commit dd05d2c987a46f0b6699d743c339297e06829e4f
Author: Charles Lindsay <chaz@yorba.org>
Date:   Tue Jan 29 19:04:52 2013 -0800

    Fix Labels icon

commit b5254fe8f6ef37df48d41167d0f52f3cd88d1966
Author: Charles Lindsay <chaz@yorba.org>
Date:   Tue Jan 29 18:43:45 2013 -0800

    Initial stab at new FolderList; fix compile errors

commit ff591810ee4312acce208dfa36d993069bc4c7d2
Merge: 2b9dbb9 ff5f9fa0
Author: Charles Lindsay <chaz@yorba.org>
Date:   Mon Jan 28 17:42:34 2013 -0800

    Merge branch 'master' into multiple-accounts

commit 2b9dbb9b6963b1d52b2b90300bcea277b01d2094
Merge: 7583241 fcfb4600
Author: Charles Lindsay <chaz@yorba.org>
Date:   Mon Jan 28 17:21:49 2013 -0800

    Merge branch 'master' into multiple-accounts

    Conflicts:
    	src/client/geary-controller.vala

commit 75832412cc806c956848e32ef20052af36d4f64d
Author: Charles Lindsay <chaz@yorba.org>
Date:   Mon Jan 28 16:37:15 2013 -0800

    Fix IMAP sess. mgr. to recover from bad passwords

commit 8868b4be5c3f5c97246d35c6170531c6f543abe1
Author: Charles Lindsay <chaz@yorba.org>
Date:   Mon Jan 28 12:06:21 2013 -0800

    Typo

commit 3f909054502d31ca48e11f7948fd22118afe7514
Author: Charles Lindsay <chaz@yorba.org>
Date:   Mon Jan 28 10:54:51 2013 -0800

    Clean up interface a little

commit 3bfb526fe8801f8234127944be8594a960ccf7e7
Merge: 5e84e93 e9712753
Author: Charles Lindsay <chaz@yorba.org>
Date:   Fri Jan 25 16:23:52 2013 -0800

    Merge branch 'master' into multiple-accounts

    Conflicts:
    	src/client/geary-application.vala
    	src/engine/api/geary-engine.vala

commit 5e84e9375a655567a3bc4eb7ebaacab2d218be40
Merge: 35cc46b 9167aeb
Author: Charles Lindsay <chaz@yorba.org>
Date:   Fri Jan 25 16:17:00 2013 -0800

    Merge branch 'pluggable-auth' into multiple-accounts

    Conflicts:
    	src/engine/api/geary-engine.vala

commit 9167aeb56be6789d49a3e7cdba2a21d2b015e40d
Author: Charles Lindsay <chaz@yorba.org>
Date:   Fri Jan 25 16:11:20 2013 -0800

    Fix for code guidelines

commit 35cc46bc99f44f1597c609bfeaa72dd503333a17
Merge: 9675f47 7612a7d
Author: Charles Lindsay <chaz@yorba.org>
Date:   Fri Jan 25 15:44:18 2013 -0800

    Merge branch 'pluggable-auth' into multiple-accounts

    Conflicts:
    	src/client/geary-application.vala

commit 7612a7ddc3df14ef207b9e74ee32fa23710e1ce9
Author: Charles Lindsay <chaz@yorba.org>
Date:   Fri Jan 25 15:26:48 2013 -0800

    Fix code review issues

commit 46635544c98df7a8b6c76f028715814907274389
Merge: 30b611e 6de36ae3
Author: Charles Lindsay <chaz@yorba.org>
Date:   Fri Jan 25 12:54:03 2013 -0800

    Merge branch 'master' into pluggable-auth

commit 9675f473e77d0d581cf73a33012981e6a4f44943
Author: Charles Lindsay <chaz@yorba.org>
Date:   Fri Jan 25 12:53:18 2013 -0800

    Try to make Folder know about its Account

commit 5d9af43e53199a616490cf6ff98bd3c613b4e5f2
Merge: 335480e 6de36ae3
Author: Charles Lindsay <chaz@yorba.org>
Date:   Fri Jan 25 12:12:21 2013 -0800

    Merge branch 'master' into multiple-accounts

commit 335480e2dd0261c8fb82f1c6296f5b8c76f3ac02
Author: Charles Lindsay <chaz@yorba.org>
Date:   Fri Jan 25 12:11:18 2013 -0800

    Work on multiple accounts; fix compilation errors

commit 808e65d55798e3f08b4c70992718cc11befbb45c
Author: Charles Lindsay <chaz@yorba.org>
Date:   Thu Jan 24 19:28:12 2013 -0800

    Fix application logic for multiple accounts

You get the idea.