[geary/wip/remote-retry: 6/7] Merge branch 'wip/cx-reestablish' into wip/remote-retry

[Jim Nelson <jnelson src gnome org>]

commit 00b026022e3552289f2b230842cf1949c1018c87
Merge: f368351 f10b131
Author: Jim Nelson <jim yorba org>
Date:   Tue Jan 20 14:21:01 2015 -0800

    Merge branch 'wip/cx-reestablish' into wip/remote-retry

 src/client/application/geary-controller.vala       |   23 +++-
 src/client/components/main-toolbar.vala            |   18 ++--
 src/client/composer/composer-embed.vala            |    9 ++-
 src/client/composer/composer-widget.vala           |  110 ++++++++++++++++++-
 .../conversation-viewer/conversation-viewer.vala   |   45 ++++++++
 src/engine/app/app-draft-manager.vala              |    1 +
 .../imap-engine/imap-engine-minimal-folder.vala    |    4 +
 src/engine/rfc822/rfc822-utils.vala                |   17 +++
 theming/message-viewer.html                        |    1 +
 9 files changed, 206 insertions(+), 22 deletions(-)
---