[geary/wip/iterate-723208: 8/9] Merge branch 'master' into iterate

[Charles Lindsay <clindsay src gnome org>]

commit 9c17317a2ffce7a9b7db88ee44db2f07dfec93f9
Merge: ad12383 cce04b8
Author: Charles Lindsay <chaz yorba org>
Date:   Wed Jan 29 18:30:36 2014 -0800

    Merge branch 'master' into iterate

 po/POTFILES.in                                     |    1 +
 po/de.po                                           |    7 +-
 sql/version-017.sql                                |    7 +
 src/CMakeLists.txt                                 |    1 +
 src/client/accounts/add-edit-page.vala             |   16 ++
 src/client/application/geary-controller.vala       |   29 +++-
 src/client/components/icon-factory.vala            |   50 -------
 src/client/components/status-bar.vala              |    9 +-
 src/client/composer/composer-window.vala           |    2 +-
 .../formatted-conversation-data.vala               |   11 +-
 .../conversation-viewer/conversation-viewer.vala   |   13 ++
 src/engine/abstract/geary-abstract-account.vala    |    8 +-
 src/engine/api/geary-account-information.vala      |   31 ++++
 src/engine/api/geary-account.vala                  |    1 +
 src/engine/api/geary-email-flags.vala              |   11 ++
 src/engine/imap-db/outbox/smtp-outbox-folder.vala  |  153 ++++++++++++++++----
 .../imap-engine/imap-engine-generic-account.vala   |    9 +-
 .../imap-engine/imap-engine-generic-folder.vala    |   42 ++++--
 .../imap-engine-generic-sent-mail-folder.vala      |   10 +-
 src/engine/imap/api/imap-account.vala              |   84 ++++++-----
 src/engine/imap/api/imap-folder-properties.vala    |   13 ++
 src/engine/imap/api/imap-folder.vala               |    2 +
 src/engine/memory/memory-offset-buffer.vala        |   47 ++++++
 src/engine/rfc822/rfc822-message.vala              |   91 ++++++------
 src/mailer/main.vala                               |    2 +-
 theming/message-viewer.css                         |    9 ++
 theming/message-viewer.html                        |    1 +
 ui/login.glade                                     |   21 +++
 28 files changed, 477 insertions(+), 204 deletions(-)
---