[geary/wip/cx-reestablish: 4/5] Merge branch 'master' into wip/cx-reestablish

[Jim Nelson <jnelson src gnome org>]

commit 5dd1932924430244d8827f22c2f52d9bb26743fa
Merge: 22097a0 5f0c028
Author: Jim Nelson <jim yorba org>
Date:   Tue Jan 20 13:55:27 2015 -0800

    Merge branch 'master' into wip/cx-reestablish

 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 +
 src/engine/rfc822/rfc822-utils.vala                |   17 +++
 theming/message-viewer.html                        |    1 +
 8 files changed, 202 insertions(+), 22 deletions(-)
---