diff --git a/po/pt_BR.po b/po/pt_BR.po
index 99e4b277..b1580a2c 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -22,8 +22,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: geary\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/geary/issues\n"
-"POT-Creation-Date: 2020-08-27 12:37+0000\n"
-"PO-Revision-Date: 2020-08-26 08:34-0300\n"
+"POT-Creation-Date: 2020-11-10 06:28+0000\n"
+"PO-Revision-Date: 2020-11-20 18:01-0300\n"
 "Last-Translator: Enrico Nicoletto <liverig@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <gnome-pt_br-list@gnome.org>\n"
 "Language: pt_BR\n"
@@ -31,7 +31,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Poedit 2.4.1\n"
+"X-Generator: Poedit 2.4.2\n"
 "X-Project-Style: gnome\n"
 
 #: desktop/geary-attach.contract.desktop.in:3
@@ -47,7 +47,7 @@ msgstr "Envie arquivos usando Geary"
 #: desktop/org.gnome.Geary.appdata.xml.in.in:11
 #: desktop/org.gnome.Geary.desktop.in.in:3
 #: src/client/accounts/accounts-editor-servers-pane.vala:560
-#: src/client/application/application-main-window.vala:608
+#: src/client/application/application-main-window.vala:628
 msgid "Geary"
 msgstr "Geary"
 
@@ -67,7 +67,9 @@ msgstr "Envie e receba e-mail"
 #. Translators: These are desktop search terms. Do not translate semicolons, end line with a semicolon.
 #: desktop/geary-autostart.desktop.in.in:7
 msgid "Email;E-mail;Mail;"
-msgstr "Email;E-mail;Mail;Correio eletrônico;e-mails;mensagens;"
+msgstr ""
+"Email;E-mail;email;emails;e-mail;Mail;Mensagem;Mensagens;mensagem;mensagens;"
+"Correio eletrônico;correio eletrônico;"
 
 #. Translators: The development team's name
 #: desktop/org.gnome.Geary.appdata.xml.in.in:13
@@ -170,88 +172,35 @@ msgid "The last recorded height of the application window."
 msgstr "A última altura registrada da janela do aplicativo."
 
 #: desktop/org.gnome.Geary.gschema.xml:26
-msgid "Position of folder list pane"
-msgstr "Posição do painel de lista de pastas"
-
-# O termo "Paned" se refere a gtk.Paned, uma class for painéis.
-# "Grabber" é termo usado no desenvolvimento para função da captura de frame
-#: desktop/org.gnome.Geary.gschema.xml:27
-msgid "Position of the folder list Paned grabber."
-msgstr "Posição do grabber do Paned da lista de pastas."
-
-#: desktop/org.gnome.Geary.gschema.xml:32
-msgid "Position of folder list pane when horizontal"
-msgstr "Posição do painel de lista de pastas quando horizontal"
-
-# O termo "Paned" se refere a gtk.Paned, uma class for painéis.
-# "Grabber" é termo usado no desenvolvimento para função da captura de frame
-#: desktop/org.gnome.Geary.gschema.xml:33
-msgid ""
-"Position of the folder list Paned grabber in the horizontal orientation."
-msgstr ""
-"Posição do grabber do Paned da lista de pastas na orientação horizontal."
-
-#: desktop/org.gnome.Geary.gschema.xml:38
-msgid "Position of folder list pane when vertical"
-msgstr "Posição do painel de lista de pastas quando vertical"
-
-# O termo "Paned" se refere a gtk.Paned, uma class for painéis.
-# "Grabber" é termo usado no desenvolvimento para função da captura de frame
-#: desktop/org.gnome.Geary.gschema.xml:39
-msgid "Position of the folder list Paned grabber in the vertical orientation."
-msgstr "Posição do grabber do Paned da lista de pastas na orientação vertical."
-
-#: desktop/org.gnome.Geary.gschema.xml:44
-msgid "Orientation of the folder list pane"
-msgstr "Orientação do painel de lista de pastas"
-
-# O termo "Paned" se refere a gtk.Paned, uma class for painéis.
-# "Grabber" é termo usado no desenvolvimento para função da captura de frame
-#: desktop/org.gnome.Geary.gschema.xml:45
-msgid "True if the folder list Paned is in the horizontal orientation."
-msgstr ""
-"Verdadeiro se o Paned da lista de pastas estiver na orientação horizontal."
-
-#: desktop/org.gnome.Geary.gschema.xml:50
 msgid "Show/hide formatting toolbar"
 msgstr "Mostrar/ocultar barra de ferramenta de formatação"
 
-#: desktop/org.gnome.Geary.gschema.xml:51
+#: desktop/org.gnome.Geary.gschema.xml:27
 msgid "True if the formatting toolbar in the composer is shown."
 msgstr ""
 "Verdadeiro se a barra de ferramenta de formatação é mostrada no compositor."
 
-#: desktop/org.gnome.Geary.gschema.xml:56
-msgid "Position of message list pane"
-msgstr "Posição do painel de lista de mensagens"
-
-# O termo "Paned" se refere a gtk.Paned, uma class for painéis.
-# "Grabber" é termo usado no desenvolvimento para função da captura de frame
-#: desktop/org.gnome.Geary.gschema.xml:57
-msgid "Position of the message list Paned grabber."
-msgstr "Posição do grabber do Paned da lista de mensagens."
-
-#: desktop/org.gnome.Geary.gschema.xml:62
+#: desktop/org.gnome.Geary.gschema.xml:32
 msgid "Autoselect next message"
 msgstr "Autosselecionar a próxima mensagem"
 
-#: desktop/org.gnome.Geary.gschema.xml:63
+#: desktop/org.gnome.Geary.gschema.xml:33
 msgid "True if we should autoselect the next available conversation."
 msgstr "Verdadeiro se devemos autosselecionar a próxima conversa disponível."
 
-#: desktop/org.gnome.Geary.gschema.xml:68
+#: desktop/org.gnome.Geary.gschema.xml:38
 msgid "Display message previews"
 msgstr "Exibir visualizações de mensagens"
 
-#: desktop/org.gnome.Geary.gschema.xml:69
+#: desktop/org.gnome.Geary.gschema.xml:39
 msgid "True if we should display a short preview of each message."
 msgstr "Verdadeiro se devemos exibir uma visualização curta de cada mensagem."
 
-#: desktop/org.gnome.Geary.gschema.xml:74
+#: desktop/org.gnome.Geary.gschema.xml:44
 msgid "Use single key shortcuts"
 msgstr "Usar atalhos de tecla única"
 
-#: desktop/org.gnome.Geary.gschema.xml:75
+#: desktop/org.gnome.Geary.gschema.xml:45
 msgid ""
 "Enables shortcuts for email actions that do not require pressing <Ctrl> to "
 "emulate those used by Gmail."
@@ -259,11 +208,11 @@ msgstr ""
 "Habilita atalhos de teclado para ações de e-mail que não exigem pressionar "
 "<Ctrl> para emular aqueles usados pelo Gmail."
 
-#: desktop/org.gnome.Geary.gschema.xml:82
+#: desktop/org.gnome.Geary.gschema.xml:52
 msgid "Languages that shall be used in the spell checker"
 msgstr "Idiomas que devem ser usados na verificação ortográfica"
 
-#: desktop/org.gnome.Geary.gschema.xml:83
+#: desktop/org.gnome.Geary.gschema.xml:53
 msgid ""
 "A list of POSIX locales, with the empty list disabling spell checking and "
 "the null list using desktop languages by default."
@@ -271,12 +220,12 @@ msgstr ""
 "Uma lista de localidades POSIX, com a lista vazia desabilitando verificação "
 "ortográfica e a lista nula usando idiomas de desktop por padrão."
 
-#: desktop/org.gnome.Geary.gschema.xml:90
+#: desktop/org.gnome.Geary.gschema.xml:60
 msgid "Languages that are displayed in the spell checker popover"
 msgstr ""
 "Idiomas que são exibidos na janela sobreposta de verificação ortográfica"
 
-#: desktop/org.gnome.Geary.gschema.xml:91
+#: desktop/org.gnome.Geary.gschema.xml:61
 msgid ""
 "List of languages that are always displayed in the popover of the spell "
 "checker."
@@ -284,61 +233,61 @@ msgstr ""
 "Lista de idiomas que sempre são exibidos na janela sobreposta da verificação "
 "ortográfica."
 
-#: desktop/org.gnome.Geary.gschema.xml:96
+#: desktop/org.gnome.Geary.gschema.xml:66
 msgid "Notify of new mail at startup"
 msgstr "Notificar sobre novo e-mail na inicialização"
 
-#: desktop/org.gnome.Geary.gschema.xml:97
+#: desktop/org.gnome.Geary.gschema.xml:67
 msgid "True to notify of new mail at startup."
 msgstr "Verdadeiro para notificar sobre novo e-mail na inicialização."
 
-#: desktop/org.gnome.Geary.gschema.xml:102
+#: desktop/org.gnome.Geary.gschema.xml:72
 msgid "Ask when opening an attachment"
 msgstr "Perguntar ao abrir um anexo"
 
-#: desktop/org.gnome.Geary.gschema.xml:103
+#: desktop/org.gnome.Geary.gschema.xml:73
 msgid "True to ask when opening an attachment."
 msgstr "Verdadeiro para perguntar ao abrir um anexo."
 
-#: desktop/org.gnome.Geary.gschema.xml:108
+#: desktop/org.gnome.Geary.gschema.xml:78
 msgid "Whether to compose emails in HTML"
 msgstr "Se deve compor e-mails em HTML"
 
-#: desktop/org.gnome.Geary.gschema.xml:109
+#: desktop/org.gnome.Geary.gschema.xml:79
 msgid "True to compose emails in HTML; false for plain text."
 msgstr "Verdadeiro para compor e-mails em HTML; falso para texto simples."
 
-#: desktop/org.gnome.Geary.gschema.xml:114
+#: desktop/org.gnome.Geary.gschema.xml:84
 msgid "Advisory strategy for full-text searching"
 msgstr "Estratégia consultiva para pesquisa de texto completo"
 
-#: desktop/org.gnome.Geary.gschema.xml:115
+#: desktop/org.gnome.Geary.gschema.xml:85
 msgid ""
 "Acceptable values are “exact”, “conservative”, “aggressive”, and “horizon”."
 msgstr ""
 "Valores aceitáveis são “exact”, “conservative”, “aggressive” e “horizon”."
 
-#: desktop/org.gnome.Geary.gschema.xml:120
+#: desktop/org.gnome.Geary.gschema.xml:90
 msgid "Zoom of conversation viewer"
 msgstr "Ampliação do visualizador de conversa"
 
-#: desktop/org.gnome.Geary.gschema.xml:121
+#: desktop/org.gnome.Geary.gschema.xml:91
 msgid "The zoom to apply on the conservation view."
 msgstr "A ampliação a ser aplicada no visualizador de conversa."
 
-#: desktop/org.gnome.Geary.gschema.xml:126
+#: desktop/org.gnome.Geary.gschema.xml:96
 msgid "Size of detached composer window"
 msgstr "Tamanho da janela do compositor destacada"
 
-#: desktop/org.gnome.Geary.gschema.xml:127
+#: desktop/org.gnome.Geary.gschema.xml:97
 msgid "The last recorded size of the detached composer window."
 msgstr "O último tamanho registrado da janela do compositor destacada."
 
-#: desktop/org.gnome.Geary.gschema.xml:132
+#: desktop/org.gnome.Geary.gschema.xml:102
 msgid "Undo sending email delay"
 msgstr "Desfazer atraso de envio de e-mail"
 
-#: desktop/org.gnome.Geary.gschema.xml:133
+#: desktop/org.gnome.Geary.gschema.xml:103
 msgid ""
 "The number of seconds to wait before sending an email. Set to zero or less "
 "to disable."
@@ -346,11 +295,11 @@ msgstr ""
 "O número de segundos para aguardar antes de eenviar um e-mail. Defina para "
 "zero ou menos para desabilitar."
 
-#: desktop/org.gnome.Geary.gschema.xml:139
+#: desktop/org.gnome.Geary.gschema.xml:109
 msgid "Brief notification display time"
 msgstr "Tempo de exibição de notificação breve"
 
-#: desktop/org.gnome.Geary.gschema.xml:140
+#: desktop/org.gnome.Geary.gschema.xml:110
 msgid ""
 "The length of time in seconds for which brief notifications should be "
 "displayed."
@@ -358,19 +307,19 @@ msgstr ""
 "O comprimento de tempo, em segundos, pelo qual as notificações breves devem "
 "ser exibidas."
 
-#: desktop/org.gnome.Geary.gschema.xml:146
+#: desktop/org.gnome.Geary.gschema.xml:116
 msgid "List of optional plugins"
 msgstr "Lista de plugins opcionais"
 
-#: desktop/org.gnome.Geary.gschema.xml:147
+#: desktop/org.gnome.Geary.gschema.xml:117
 msgid "Plugins listed here will be loaded on startup."
 msgstr "Plugins listados aqui serão carregados na inicialização."
 
-#: desktop/org.gnome.Geary.gschema.xml:152
+#: desktop/org.gnome.Geary.gschema.xml:122
 msgid "Whether we migrated the old settings"
 msgstr "Se migramos as configurações antigas"
 
-#: desktop/org.gnome.Geary.gschema.xml:153
+#: desktop/org.gnome.Geary.gschema.xml:123
 msgid ""
 "False to check for the old “org.yorba.geary”-schema and copy its values."
 msgstr ""
@@ -647,12 +596,12 @@ msgstr[0] "%d dia atrás"
 msgstr[1] "%d dias atrás"
 
 #: src/client/accounts/accounts-editor-list-pane.vala:255
-#: src/client/application/application-main-window.vala:2061
+#: src/client/application/application-main-window.vala:2129
 msgid "Undo"
 msgstr "Desfazer"
 
 #: src/client/accounts/accounts-editor-list-pane.vala:264
-#: src/client/application/application-main-window.vala:2044
+#: src/client/application/application-main-window.vala:2112
 msgid "Redo"
 msgstr "Refazer"
 
@@ -747,7 +696,7 @@ msgstr "TLS"
 #. account
 #. Translators: An info bar button label
 #: src/client/accounts/accounts-editor-row.vala:539
-#: src/client/application/application-main-window.vala:554
+#: src/client/application/application-main-window.vala:574
 msgid "Login"
 msgstr "Login"
 
@@ -857,130 +806,130 @@ msgid "Visit the Geary web site"
 msgstr "Visite o website do Geary"
 
 #. / Command line option
-#: src/client/application/application-client.vala:97
+#: src/client/application/application-client.vala:102
 msgid "Print debug logging"
 msgstr "Emite log de depuração"
 
 #. / Command line option
-#: src/client/application/application-client.vala:100
+#: src/client/application/application-client.vala:105
 msgid "Start with the main window hidden (deprecated)"
 msgstr "Inicia com a janela principal oculta (obsoleto)"
 
 #. / Command line option
-#: src/client/application/application-client.vala:103
+#: src/client/application/application-client.vala:108
 msgid "Enable WebKitGTK Inspector in web views"
 msgstr "Habilita Inspetor WebKitGTK em exibições web"
 
 #. / Command line option
-#: src/client/application/application-client.vala:106
+#: src/client/application/application-client.vala:111
 msgid "Log conversation monitoring"
 msgstr "Registra monitoramento de conversa"
 
 #. / Command line option
-#: src/client/application/application-client.vala:109
+#: src/client/application/application-client.vala:114
 msgid "Log IMAP network deserialization"
 msgstr "Registra desserialização de rede IMAP"
 
 #. / Command line option. "Normalization" can also be called
 #. / "synchronization".
-#: src/client/application/application-client.vala:113
+#: src/client/application/application-client.vala:118
 msgid "Log folder normalization"
 msgstr "Registra normalização de pasta"
 
 #. / Command line option
-#: src/client/application/application-client.vala:116
+#: src/client/application/application-client.vala:121
 msgid "Log IMAP network activity"
 msgstr "Registra atividade de rede de IMAP"
 
 #. / Command line option. The IMAP replay queue is how changes
 #. / on the server are replicated on the client.  It could
 #. / also be called the IMAP events queue.
-#: src/client/application/application-client.vala:121
+#: src/client/application/application-client.vala:126
 msgid "Log IMAP replay queue"
 msgstr "Registra lista de repetição de IMAP"
 
 #. / Command line option
-#: src/client/application/application-client.vala:124
+#: src/client/application/application-client.vala:129
 msgid "Log SMTP network activity"
 msgstr "Registra atividade de rede de STMP"
 
 #. / Command line option
-#: src/client/application/application-client.vala:127
+#: src/client/application/application-client.vala:132
 msgid "Log database queries (generates lots of messages)"
 msgstr "Registra consultas ao banco de dados (gera muitas mensagens)"
 
 #. / Command line option
-#: src/client/application/application-client.vala:130
+#: src/client/application/application-client.vala:135
 msgid "Perform a graceful quit"
 msgstr "Realiza uma saída graciosa"
 
-#: src/client/application/application-client.vala:132
+#: src/client/application/application-client.vala:137
 msgid "Open a new window"
 msgstr "Abre uma nova janela"
 
 #. / Command line option
-#: src/client/application/application-client.vala:135
+#: src/client/application/application-client.vala:140
 msgid "Revoke all pinned TLS server certificates"
 msgstr "Revoga todos os certificados de servidor TLS fixados"
 
 #. / Command line option
-#: src/client/application/application-client.vala:138
+#: src/client/application/application-client.vala:143
 msgid "Display program version"
 msgstr "Mostra versão do programa"
 
 #. / Application runtime information label
-#: src/client/application/application-client.vala:262
+#: src/client/application/application-client.vala:275
 msgid "Geary version"
 msgstr "Versão do Geary"
 
 #. / Application runtime information label
-#: src/client/application/application-client.vala:264
+#: src/client/application/application-client.vala:277
 msgid "Geary revision"
 msgstr "Revisão do Geary"
 
 #. / Application runtime information label
-#: src/client/application/application-client.vala:266
+#: src/client/application/application-client.vala:279
 msgid "GTK version"
 msgstr "Versão do GTK"
 
 #. / Applciation runtime information label
-#: src/client/application/application-client.vala:273
+#: src/client/application/application-client.vala:286
 msgid "GLib version"
 msgstr "Versão do GLib"
 
 #. / Application runtime information label
-#: src/client/application/application-client.vala:280
+#: src/client/application/application-client.vala:293
 msgid "WebKitGTK version"
 msgstr "Versão do WebKitGTK"
 
 #. / Application runtime information label
-#: src/client/application/application-client.vala:287
+#: src/client/application/application-client.vala:300
 msgid "Desktop environment"
 msgstr "Ambiente"
 
 #. Translators: This is the file type displayed for
 #. attachments with unknown file types.
-#: src/client/application/application-client.vala:289
+#: src/client/application/application-client.vala:302
 #: src/client/components/components-attachment-pane.vala:91
 msgid "Unknown"
 msgstr "Desconhecido"
 
 #. / Application runtime information label
-#: src/client/application/application-client.vala:293
+#: src/client/application/application-client.vala:306
 msgid "Distribution name"
 msgstr "Nome da distribuição"
 
 #. / Application runtime information label
-#: src/client/application/application-client.vala:298
+#: src/client/application/application-client.vala:311
 msgid "Distribution release"
 msgstr "Lançamento da distribuição"
 
 #. / Application runtime information label
-#: src/client/application/application-client.vala:303
+#: src/client/application/application-client.vala:316
 msgid "Installation prefix"
 msgstr "Prefixo de lançamento"
 
-#: src/client/application/application-client.vala:558
+#: src/client/application/application-client.vala:573
 #, c-format
 msgid "About %s"
 msgstr "Sobre %s"
@@ -988,7 +937,7 @@ msgstr "Sobre %s"
 #. Translators: add your name and email address to receive
 #. credit in the About dialog For example: Yamada Taro
 #. <yamada.taro@example.com>
-#: src/client/application/application-client.vala:562
+#: src/client/application/application-client.vala:577
 msgid "translator-credits"
 msgstr ""
 "Leonardo Lemos <leonardolemos@live.com>\n"
@@ -999,37 +948,37 @@ msgstr ""
 
 #. / Warning printed to the console when a deprecated
 #. / command line option is used.
-#: src/client/application/application-client.vala:1046
+#: src/client/application/application-client.vala:1096
 msgid "The `--hidden` option is deprecated and will be removed in the future."
 msgstr "A opção `--hidden` está obsoleta e será removida no futuro."
 
 #. / Command line warning, string substitution
 #. / is the given argument
-#: src/client/application/application-client.vala:1079
+#: src/client/application/application-client.vala:1129
 #, c-format
 msgid "Unrecognised program argument: “%s”"
 msgstr "Argumento do programa não reconhecida “%s”"
 
 #. / Notification title.
-#: src/client/application/application-controller.vala:479
+#: src/client/application/application-controller.vala:490
 #, c-format
 msgid "A problem occurred sending email for %s"
 msgstr "Ocorreu um problema ao enviar e-mail para %s"
 
 #. / Notification body
-#: src/client/application/application-controller.vala:483
+#: src/client/application/application-controller.vala:494
 msgid "Email will not be sent until re-connected"
 msgstr "O e-mail não será enviado até reconectar"
 
 #. / Translators: Label for in-app notification
-#: src/client/application/application-controller.vala:582
+#: src/client/application/application-controller.vala:593
 msgid "Conversation marked"
 msgid_plural "Conversations marked"
 msgstr[0] "Conversa marcada"
 msgstr[1] "Conversas marcadas"
 
 #. / Translators: Label for in-app notification
-#: src/client/application/application-controller.vala:588
+#: src/client/application/application-controller.vala:599
 msgid "Conversation un-marked"
 msgid_plural "Conversations un-marked"
 msgstr[0] "Conversa desmarcada"
@@ -1038,8 +987,8 @@ msgstr[1] "Conversas desmarcadas"
 #. / Translators: Label for in-app
 #. / notification. String substitution is the name
 #. / of the destination folder.
-#: src/client/application/application-controller.vala:614
-#: src/client/application/application-controller.vala:698
+#: src/client/application/application-controller.vala:625
+#: src/client/application/application-controller.vala:709
 #, c-format
 msgid "Conversation moved to %s"
 msgid_plural "Conversations moved to %s"
@@ -1051,8 +1000,8 @@ msgstr[1] "Conversas movidas para %s"
 #. / of the source folder.
 #. / Translators: Label for in-app notification. String
 #. / substitution is the name of the destination folder.
-#: src/client/application/application-controller.vala:622
-#: src/client/application/application-controller.vala:644
+#: src/client/application/application-controller.vala:633
+#: src/client/application/application-controller.vala:655
 #, c-format
 msgid "Conversation restored to %s"
 msgid_plural "Conversations restored to %s"
@@ -1060,7 +1009,7 @@ msgstr[0] "Conversa restaurada para %s"
 msgstr[1] "Conversas restauradas para %s"
 
 #. / Translators: Label for in-app notification.
-#: src/client/application/application-controller.vala:665
+#: src/client/application/application-controller.vala:676
 msgid "Conversation archived"
 msgid_plural "Conversations archived"
 msgstr[0] "Conversa arquivada"
@@ -1068,7 +1017,7 @@ msgstr[1] "Conversas arquivadas"
 
 #. / Translators: Label for in-app notification. String
 #. / substitution is the name of the destination folder.
-#: src/client/application/application-controller.vala:721
+#: src/client/application/application-controller.vala:732
 #, c-format
 msgid "Message restored to %s"
 msgid_plural "Messages restored to %s"
@@ -1076,7 +1025,7 @@ msgstr[0] "Mensagem restaurada para %s"
 msgstr[1] "Mensagens restauradas para %s"
 
 #. / Translators: Label for in-app notification.
-#: src/client/application/application-controller.vala:742
+#: src/client/application/application-controller.vala:753
 msgid "Message archived"
 msgid_plural "Messages archived"
 msgstr[0] "Mensagem arquivada"
@@ -1085,7 +1034,7 @@ msgstr[1] "Mensagens arquivadas"
 #. / Translators: Label for in-app
 #. / notification. String substitution is the name
 #. / of the destination folder.
-#: src/client/application/application-controller.vala:777
+#: src/client/application/application-controller.vala:788
 #, c-format
 msgid "Message moved to %s"
 msgid_plural "Messages moved to %s"
@@ -1095,7 +1044,7 @@ msgstr[1] "Mensagens movidas para %s"
 #. / Translators: Label for in-app
 #. / notification. String substitution is the name
 #. / of the destination folder.
-#: src/client/application/application-controller.vala:805
+#: src/client/application/application-controller.vala:816
 #, c-format
 msgid "Conversation labelled as %s"
 msgid_plural "Conversations labelled as %s"
@@ -1105,19 +1054,19 @@ msgstr[1] "Conversas rotuladas como %s"
 #. / Translators: Label for in-app
 #. / notification. String substitution is the name
 #. / of the destination folder.
-#: src/client/application/application-controller.vala:813
+#: src/client/application/application-controller.vala:824
 #, c-format
 msgid "Conversation un-labelled as %s"
 msgid_plural "Conversations un-labelled as %s"
 msgstr[0] "Conversa desrotulada como %s"
 msgstr[1] "Conversas desrotuladas como %s"
 
-#: src/client/application/application-controller.vala:1320
+#: src/client/application/application-controller.vala:1331
 #, c-format
 msgid "Unable to open the database for %s"
 msgstr "Incapaz de abrir o banco de dados para %s"
 
-#: src/client/application/application-controller.vala:1321
+#: src/client/application/application-controller.vala:1332
 #, c-format
 msgid ""
 "There was an error opening the local mail database for this account. This is "
@@ -1142,20 +1091,20 @@ msgstr ""
 "Reconstruir o banco de dados irá destruir todos e-mails locais e seus "
 "anexos. <b>Os e-mails no seu servidor não serão afetados.</b>"
 
-#: src/client/application/application-controller.vala:1323
+#: src/client/application/application-controller.vala:1334
 msgid "_Rebuild"
 msgstr "_Reconstruir"
 
-#: src/client/application/application-controller.vala:1323
+#: src/client/application/application-controller.vala:1334
 msgid "E_xit"
 msgstr "S_air"
 
-#: src/client/application/application-controller.vala:1333
+#: src/client/application/application-controller.vala:1344
 #, c-format
 msgid "Unable to rebuild database for “%s”"
 msgstr "Incapaz de reconstruir o banco de dados para “%s”"
 
-#: src/client/application/application-controller.vala:1334
+#: src/client/application/application-controller.vala:1345
 #, c-format
 msgid ""
 "Error during rebuild:\n"
@@ -1168,87 +1117,87 @@ msgstr ""
 
 #. / Translators: The label for an in-app notification. The
 #. / string substitution is a list of recipients of the email.
-#: src/client/application/application-controller.vala:1501
+#: src/client/application/application-controller.vala:1512
 #, c-format
 msgid "Email sent to %s"
 msgstr "E-mail enviado para %s"
 
 #. / Translators: The label for an in-app notification. The
 #. / string substitution is a list of recipients of the email.
-#: src/client/application/application-controller.vala:2491
+#: src/client/application/application-controller.vala:2502
 #, c-format
 msgid "Email to %s queued for delivery"
 msgstr "E-mail para %s enfileirado para entrega"
 
 #. / Translators: The label for an in-app notification. The
 #. / string substitution is a list of recipients of the email.
-#: src/client/application/application-controller.vala:2555
+#: src/client/application/application-controller.vala:2566
 #, c-format
 msgid "Email to %s saved"
 msgstr "E-mail para %s salvo"
 
 #. / Translators: A label for an in-app notification.
-#: src/client/application/application-controller.vala:2570
-#: src/client/application/application-controller.vala:2628
+#: src/client/application/application-controller.vala:2581
+#: src/client/application/application-controller.vala:2639
 msgid "Composer could not be restored"
 msgstr "O compositor não pôde ser restaurado"
 
 #. / Translators: The label for an in-app notification. The
 #. / string substitution is a list of recipients of the email.
-#: src/client/application/application-controller.vala:2613
+#: src/client/application/application-controller.vala:2624
 #, c-format
 msgid "Email to %s discarded"
 msgstr "E-mail para %s descartado"
 
 #. Translators: An info bar status label
-#: src/client/application/application-main-window.vala:540
+#: src/client/application/application-main-window.vala:560
 msgid "Working offline"
 msgstr "Trabalhar desconectado"
 
 #. Translators: An info bar description label
-#: src/client/application/application-main-window.vala:542
+#: src/client/application/application-main-window.vala:562
 msgid "You will not be able to send or receive email until re-connected."
 msgstr "Você não poderá enviar ou receber e-mails até que seja reconectado."
 
 #. Translators: An info bar status label
-#: src/client/application/application-main-window.vala:549
+#: src/client/application/application-main-window.vala:569
 msgid "Login problem"
 msgstr "Problema de login"
 
 #. Translators: An info bar description label
-#: src/client/application/application-main-window.vala:551
+#: src/client/application/application-main-window.vala:571
 msgid "An account has reported an incorrect login or password."
 msgstr "Uma conta relatou um login ou senha incorretos."
 
 #. Translators: An info bar button tool-tip
-#: src/client/application/application-main-window.vala:558
+#: src/client/application/application-main-window.vala:578
 msgid "Retry login, you will be prompted for your password"
 msgstr "Tente novamente, você será solicitado a inserir uma senha"
 
 #. Translators: An info bar status label
-#: src/client/application/application-main-window.vala:565
+#: src/client/application/application-main-window.vala:585
 msgid "Security problem"
 msgstr "Problema de segurança"
 
 #. Translators: An info bar description label
-#: src/client/application/application-main-window.vala:567
+#: src/client/application/application-main-window.vala:587
 msgid "An account has reported an untrusted server."
 msgstr "Uma conta relatou um servidor não confiável."
 
 #. Translators: An info bar button label
-#: src/client/application/application-main-window.vala:570
+#: src/client/application/application-main-window.vala:590
 msgid "Check"
 msgstr "Verificar"
 
 #. Translators: An info bar button tool-tip
-#: src/client/application/application-main-window.vala:574
+#: src/client/application/application-main-window.vala:594
 msgid "Check the security details for the connection"
 msgstr "Verifica os detalhes de segurança da conexão"
 
 #. / Translators: Main window title, first string
 #. / substitution being the currently selected folder name,
 #. / the second being the selected account name.
-#: src/client/application/application-main-window.vala:617
+#: src/client/application/application-main-window.vala:637
 #, c-format
 msgid "%s — %s"
 msgstr "%s — %s"
@@ -1256,49 +1205,49 @@ msgstr "%s — %s"
 #. Translators: The name of the folder group containing
 #. folders created by people (as opposed to special-use
 #. folders)
-#: src/client/application/application-main-window.vala:996
+#: src/client/application/application-main-window.vala:1019
 #: src/client/folder-list/folder-list-account-branch.vala:43
 msgid "Labels"
 msgstr "Marcadores"
 
-#: src/client/application/application-main-window.vala:1293
+#: src/client/application/application-main-window.vala:1337
 #, c-format
 msgid "Empty all email from your %s folder?"
 msgstr "Esvaziar todos os e-mails de sua pasta %s?"
 
-#: src/client/application/application-main-window.vala:1294
+#: src/client/application/application-main-window.vala:1338
 msgid "This removes the email from Geary and your email server."
 msgstr "Isto remove o e-mail do Geary e do seu servidor de e-mail."
 
-#: src/client/application/application-main-window.vala:1295
+#: src/client/application/application-main-window.vala:1339
 msgid "This cannot be undone."
 msgstr "Isso não pode ser desfeito."
 
-#: src/client/application/application-main-window.vala:1296
+#: src/client/application/application-main-window.vala:1340
 #, c-format
 msgid "Empty %s"
 msgstr "Esvaziar %s"
 
 #. / Translators: Primary text for a confirmation dialog
-#: src/client/application/application-main-window.vala:1353
+#: src/client/application/application-main-window.vala:1397
 msgid "Do you want to permanently delete this conversation?"
 msgid_plural "Do you want to permanently delete these conversations?"
 msgstr[0] "Você deseja descartar permanentemente essa conversa?"
 msgstr[1] "Você deseja descartar permanentemente essas conversas?"
 
-#: src/client/application/application-main-window.vala:1358
-#: src/client/application/application-main-window.vala:1373
+#: src/client/application/application-main-window.vala:1402
+#: src/client/application/application-main-window.vala:1417
 msgid "Delete"
 msgstr "Excluir"
 
 #. / Translators: Primary text for a confirmation dialog
-#: src/client/application/application-main-window.vala:1368
+#: src/client/application/application-main-window.vala:1412
 msgid "Do you want to permanently delete this message?"
 msgid_plural "Do you want to permanently delete these messages?"
 msgstr[0] "Você deseja descartar permanentemente essa mensagem?"
 msgstr[1] "Você deseja descartar permanentemente essas mensagens?"
 
-#: src/client/application/application-main-window.vala:1691
+#: src/client/application/application-main-window.vala:1703
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
@@ -1309,7 +1258,7 @@ msgstr "%s (%d)"
 #. Document (100.9MB)
 #. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
 #: src/client/components/components-attachment-pane.vala:107
-#: src/client/composer/composer-widget.vala:1989
+#: src/client/composer/composer-widget.vala:1835
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
@@ -1330,6 +1279,42 @@ msgstr ""
 msgid "Don’t _ask me again"
 msgstr "Não me _pergunte novamente"
 
+#: src/client/components/components-conversation-actions.vala:90
+msgid "Mark conversation"
+msgid_plural "Mark conversations"
+msgstr[0] "Marca a conversa"
+msgstr[1] "Marca as conversas"
+
+#: src/client/components/components-conversation-actions.vala:95
+msgid "Add label to conversation"
+msgid_plural "Add label to conversations"
+msgstr[0] "Adiciona marcador à conversa"
+msgstr[1] "Adiciona marcador às conversas"
+
+#: src/client/components/components-conversation-actions.vala:100
+msgid "Move conversation"
+msgid_plural "Move conversations"
+msgstr[0] "Move a conversa"
+msgstr[1] "Move as conversas"
+
+#: src/client/components/components-conversation-actions.vala:105
+msgid "Archive conversation"
+msgid_plural "Archive conversations"
+msgstr[0] "Arquivar a conversa"
+msgstr[1] "Arquivar as conversas"
+
+#: src/client/components/components-conversation-actions.vala:116
+msgid "Move conversation to Trash"
+msgid_plural "Move conversations to Trash"
+msgstr[0] "Move a conversa para a lixeira"
+msgstr[1] "Move as conversas para a lixeira"
+
+#: src/client/components/components-conversation-actions.vala:126
+msgid "Delete conversation"
+msgid_plural "Delete conversations"
+msgstr[0] "Excluir conversa"
+msgstr[1] "Excluir conversas"
+
 #: src/client/components/components-inspector.vala:78
 msgid "Inspector"
 msgstr "Inspetor"
@@ -1360,7 +1345,7 @@ msgstr "Salvar como"
 
 #: src/client/components/components-inspector.vala:230
 #: src/client/dialogs/dialogs-problem-details-dialog.vala:224
-#: ui/accounts_editor_servers_pane.ui:17
+#: ui/accounts_editor_servers_pane.ui:17 ui/composer-headerbar.ui:61
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -1376,15 +1361,10 @@ msgstr "_Exibir visualização de conversa"
 
 #. / Translators: Preferences label
 #: src/client/components/components-preferences-window.vala:144
-msgid "Use _three pane view"
-msgstr "Usar visão de _três painéis"
-
-#. / Translators: Preferences label
-#: src/client/components/components-preferences-window.vala:154
 msgid "Use _single key email shortcuts"
 msgstr "Usar atalhos de e-mail de tecla única"
 
-#: src/client/components/components-preferences-window.vala:156
+#: src/client/components/components-preferences-window.vala:146
 msgid ""
 "Enable keyboard shortcuts for email actions that do not require pressing "
 "<Ctrl>"
@@ -1393,22 +1373,22 @@ msgstr ""
 "<Ctrl>"
 
 #. / Translators: Preferences label
-#: src/client/components/components-preferences-window.vala:167
+#: src/client/components/components-preferences-window.vala:157
 msgid "_Watch for new mail when closed"
 msgstr "_Monitorar por um novo e-mail quando fechado"
 
 #. / Translators: Preferences tooltip
-#: src/client/components/components-preferences-window.vala:171
+#: src/client/components/components-preferences-window.vala:161
 msgid "Geary will keep running after all windows are closed"
 msgstr "Geary continuará em execução após todas as janelas estarem fechadas"
 
 #. / Translators: Preferences page title
-#: src/client/components/components-preferences-window.vala:189
+#: src/client/components/components-preferences-window.vala:178
 msgid "Preferences"
 msgstr "Preferências"
 
 #. / Translators: Preferences page title
-#: src/client/components/components-preferences-window.vala:250
+#: src/client/components/components-preferences-window.vala:234
 msgid "Plugins"
 msgstr "Plugins"
 
@@ -1481,22 +1461,6 @@ msgstr "Veja detalhes técnicos sobre o erro"
 msgid "_Retry"
 msgstr "_Tentar novamente"
 
-#: src/client/components/components-reflow-box.c:454
-msgid "Spacing"
-msgstr "Espaçamento"
-
-#: src/client/components/components-reflow-box.c:455
-msgid "Spacing between children"
-msgstr "Espaçamento entre filhos"
-
-#: src/client/components/components-reflow-box.c:470
-msgid "Row spacing"
-msgstr "Espaçamento de linha"
-
-#: src/client/components/components-reflow-box.c:471
-msgid "Spacing between rows of children"
-msgstr "Espaçamento entre linhas de filhos"
-
 #. / Translators: Search entry placeholder text
 #: src/client/components/components-search-bar.vala:12
 #: src/client/folder-list/folder-list-search-branch.vala:53
@@ -1543,42 +1507,6 @@ msgstr "Um nome de servidor é necessário"
 msgid "Could not look up server name"
 msgstr "Não foi possível procurar por nome do servidor"
 
-#: src/client/components/main-toolbar.vala:116
-msgid "Mark conversation"
-msgid_plural "Mark conversations"
-msgstr[0] "Marca a conversa"
-msgstr[1] "Marca as conversas"
-
-#: src/client/components/main-toolbar.vala:121
-msgid "Add label to conversation"
-msgid_plural "Add label to conversations"
-msgstr[0] "Adiciona marcador à conversa"
-msgstr[1] "Adiciona marcador às conversas"
-
-#: src/client/components/main-toolbar.vala:126
-msgid "Move conversation"
-msgid_plural "Move conversations"
-msgstr[0] "Move a conversa"
-msgstr[1] "Move as conversas"
-
-#: src/client/components/main-toolbar.vala:131
-msgid "Archive conversation"
-msgid_plural "Archive conversations"
-msgstr[0] "Arquivar a conversa"
-msgstr[1] "Arquivar as conversas"
-
-#: src/client/components/main-toolbar.vala:142
-msgid "Move conversation to Trash"
-msgid_plural "Move conversations to Trash"
-msgstr[0] "Move a conversa para a lixeira"
-msgstr[1] "Move as conversas para a lixeira"
-
-#: src/client/components/main-toolbar.vala:152
-msgid "Delete conversation"
-msgid_plural "Delete conversations"
-msgstr[0] "Excluir conversa"
-msgstr[1] "Excluir conversas"
-
 #. / Displayed in the space-limited status bar while a message is in the process of being sent.
 #: src/client/components/status-bar.vala:26
 msgid "Sending…"
@@ -1657,6 +1585,10 @@ msgstr "_Salvar"
 msgid "_Keep"
 msgstr "_Manter"
 
+#: src/client/composer/composer-editor.vala:675
+msgid "Select Color"
+msgstr "Selecione a cor"
+
 #: src/client/composer/composer-link-popover.vala:139
 msgid "Link URL is not correctly formatted, e.g. http://example.com"
 msgstr "URL de link não está corretamente formatado, ex.: http://example.com"
@@ -1670,23 +1602,23 @@ msgid "Invalid email address"
 msgstr "Endereço de e-mail inválido"
 
 #. / Translators: Title for an empty composer window
-#: src/client/composer/composer-widget.vala:35
+#: src/client/composer/composer-widget.vala:32
 msgid "New Message"
 msgstr "Nova mensagem"
 
-#: src/client/composer/composer-widget.vala:239
+#: src/client/composer/composer-widget.vala:167
 msgid "Saved"
 msgstr "Salvo"
 
-#: src/client/composer/composer-widget.vala:240
+#: src/client/composer/composer-widget.vala:168
 msgid "Saving"
 msgstr "Salvando"
 
-#: src/client/composer/composer-widget.vala:241
+#: src/client/composer/composer-widget.vala:169
 msgid "Error saving"
 msgstr "Erro ao salvar"
 
-#: src/client/composer/composer-widget.vala:242
+#: src/client/composer/composer-widget.vala:170
 msgid "Press Backspace to delete quote"
 msgstr "Pressione Backspace para excluir citação"
 
@@ -1695,7 +1627,7 @@ msgstr "Pressione Backspace para excluir citação"
 #. checking, include all variants of each word. No spaces are
 #. allowed. The words will be converted to lower case based on
 #. locale and English versions included automatically.
-#: src/client/composer/composer-widget.vala:258
+#: src/client/composer/composer-widget.vala:186
 msgid ""
 "attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|"
 "enclosing|encloses|enclosure|enclosures"
@@ -1706,109 +1638,105 @@ msgstr ""
 #. Translators: This dialog text is displayed to the
 #. user when closing a composer where the options are
 #. Keep, Discard or Cancel.
-#: src/client/composer/composer-widget.vala:997
+#: src/client/composer/composer-widget.vala:867
 msgid "Do you want to keep or discard this draft message?"
 msgstr "Você deseja manter ou descartar esta mensagem de rascunho?"
 
 #. Translators: This dialog text is displayed to the
 #. user when closing a composer where the options are
 #. only Discard or Cancel.
-#: src/client/composer/composer-widget.vala:1023
+#: src/client/composer/composer-widget.vala:893
 msgid "Do you want to discard this draft message?"
 msgstr "Você deseja descartar esta mensagem de rascunho?"
 
-#: src/client/composer/composer-widget.vala:1645
+#: src/client/composer/composer-widget.vala:1468
 msgid "Send message with an empty subject and body?"
 msgstr "Enviar mensagem com o assunto e corpo vazio?"
 
-#: src/client/composer/composer-widget.vala:1647
+#: src/client/composer/composer-widget.vala:1470
 msgid "Send message with an empty subject?"
 msgstr "Enviar mensagem com o assunto vazio?"
 
-#: src/client/composer/composer-widget.vala:1649
+#: src/client/composer/composer-widget.vala:1472
 msgid "Send message with an empty body?"
 msgstr "Enviar mensagem com o corpo vazio?"
 
-#: src/client/composer/composer-widget.vala:1658
+#: src/client/composer/composer-widget.vala:1481
 msgid "Send message without an attachment?"
 msgstr "Enviar mensagem sem anexo?"
 
-#: src/client/composer/composer-widget.vala:1977
+#: src/client/composer/composer-widget.vala:1823
 #, c-format
 msgid "“%s” already attached for delivery."
 msgstr "“%s” já foi anexado para envio."
 
-#: src/client/composer/composer-widget.vala:2009
-#: src/client/composer/composer-widget.vala:2059
+#: src/client/composer/composer-widget.vala:1855
+#: src/client/composer/composer-widget.vala:1905
 #, c-format
 msgid "“%s” is an empty file."
 msgstr "“%s” é um arquivo vazio."
 
-#: src/client/composer/composer-widget.vala:2047
+#: src/client/composer/composer-widget.vala:1893
 #, c-format
 msgid "“%s” could not be found."
 msgstr "“%s” não foi encontrado."
 
-#: src/client/composer/composer-widget.vala:2053
+#: src/client/composer/composer-widget.vala:1899
 #, c-format
 msgid "“%s” is a folder."
 msgstr "“%s” é uma pasta."
 
-#: src/client/composer/composer-widget.vala:2072
+#: src/client/composer/composer-widget.vala:1918
 #, c-format
 msgid "“%s” could not be opened for reading."
 msgstr "“%s” não pôde ser aberto para leitura."
 
-#: src/client/composer/composer-widget.vala:2080
+#: src/client/composer/composer-widget.vala:1926
 msgid "Cannot add attachment"
 msgstr "Não é possível adicionar anexo"
 
+#. Translators: This is the name of the file chooser filter
+#. when inserting an image in the composer.
+#: src/client/composer/composer-widget.vala:1997
+msgid "Images"
+msgstr "Imagens"
+
 #. Translators: Human-readable version of the RFC 822 To header
-#: src/client/composer/composer-widget.vala:2140
+#: src/client/composer/composer-widget.vala:2061
 #: src/client/conversation-viewer/conversation-email.vala:542
-#: src/client/util/util-email.vala:249 ui/conversation-message.ui:312
+#: src/client/util/util-email.vala:265 ui/conversation-message.ui:312
 msgid "To:"
 msgstr "Para:"
 
 #. Translators: Human-readable version of the RFC 822 CC header
-#: src/client/composer/composer-widget.vala:2146
+#: src/client/composer/composer-widget.vala:2067
 #: src/client/conversation-viewer/conversation-email.vala:547
-#: src/client/util/util-email.vala:254 ui/conversation-message.ui:357
+#: src/client/util/util-email.vala:270 ui/conversation-message.ui:357
 msgid "Cc:"
 msgstr "Cc:"
 
 #. Translators: Human-readable version of the RFC 822 BCC header
-#: src/client/composer/composer-widget.vala:2152
+#: src/client/composer/composer-widget.vala:2073
 #: src/client/conversation-viewer/conversation-email.vala:552
 #: ui/conversation-message.ui:402
 msgid "Bcc:"
 msgstr "Cco:"
 
 #. Translators: Human-readable version of the RFC 822 Reply-To header
-#: src/client/composer/composer-widget.vala:2158
+#: src/client/composer/composer-widget.vala:2079
 msgid "Reply-To: "
 msgstr "Responder-a: "
 
-#: src/client/composer/composer-widget.vala:2410
-msgid "Select Color"
-msgstr "Selecione a cor"
-
 #. Displayed in the From dropdown to indicate an
 #. "alternate email address" for an account.  The first
 #. printf argument will be the alternate email address,
 #. and the second will be the account's primary email
 #. address.
-#: src/client/composer/composer-widget.vala:2599
+#: src/client/composer/composer-widget.vala:2197
 #, c-format
 msgid "%1$s via %2$s"
 msgstr "%1$s via %2$s"
 
-#. Translators: This is the name of the file chooser filter
-#. when inserting an image in the composer.
-#: src/client/composer/composer-widget.vala:2959
-msgid "Images"
-msgstr "Imagens"
-
 #: src/client/composer/spell-check-popover.vala:125
 msgid "Remove this language from the preferred list"
 msgstr "Remover esse idioma da lista de preferência"
@@ -1822,51 +1750,51 @@ msgid "Search for more languages"
 msgstr "Procurar por mais idiomas"
 
 #. / Translators: Context menu item
-#: src/client/conversation-list/conversation-list-view.vala:339
+#: src/client/conversation-list/conversation-list-view.vala:389
 msgid "Move conversation to _Trash"
 msgid_plural "Move conversations to _Trash"
 msgstr[0] "Mover a conversa para a Li_xeira"
 msgstr[1] "Mover as conversas para a Li_xeira"
 
 #. / Translators: Context menu item
-#: src/client/conversation-list/conversation-list-view.vala:351
+#: src/client/conversation-list/conversation-list-view.vala:401
 msgid "_Delete conversation"
 msgid_plural "_Delete conversations"
 msgstr[0] "_Excluir conversa"
 msgstr[1] "_Excluir conversas"
 
-#: src/client/conversation-list/conversation-list-view.vala:364
+#: src/client/conversation-list/conversation-list-view.vala:414
 #: ui/main-toolbar-menus.ui:5
 msgid "Mark as _Read"
 msgstr "Marcar como l_ida"
 
-#: src/client/conversation-list/conversation-list-view.vala:372
+#: src/client/conversation-list/conversation-list-view.vala:422
 #: ui/main-toolbar-menus.ui:9
 msgid "Mark as _Unread"
 msgstr "Marcar como _não lida"
 
-#: src/client/conversation-list/conversation-list-view.vala:380
+#: src/client/conversation-list/conversation-list-view.vala:430
 #: ui/main-toolbar-menus.ui:17
 msgid "U_nstar"
 msgstr "_Tirar estrela"
 
-#: src/client/conversation-list/conversation-list-view.vala:387
+#: src/client/conversation-list/conversation-list-view.vala:437
 #: ui/main-toolbar-menus.ui:13
 msgid "_Star"
 msgstr "_Marcar estrela"
 
 #. Translators: Menu item to reply to a specific message.
-#: src/client/conversation-list/conversation-list-view.vala:396
+#: src/client/conversation-list/conversation-list-view.vala:446
 #: ui/conversation-email-menus.ui:9
 msgid "_Reply"
 msgstr "_Responder"
 
-#: src/client/conversation-list/conversation-list-view.vala:402
+#: src/client/conversation-list/conversation-list-view.vala:452
 msgid "R_eply All"
 msgstr "R_esponder todos"
 
 #. Translators: Menu item to forward a specific message.
-#: src/client/conversation-list/conversation-list-view.vala:408
+#: src/client/conversation-list/conversation-list-view.vala:458
 #: ui/conversation-email-menus.ui:21
 msgid "_Forward"
 msgstr "_Encaminhar"
@@ -1877,19 +1805,19 @@ msgstr "Eu"
 
 #. Translators: Human-readable version of the RFC 822 From header
 #: src/client/conversation-viewer/conversation-email.vala:537
-#: src/client/util/util-email.vala:240
+#: src/client/util/util-email.vala:256
 msgid "From:"
 msgstr "De:"
 
 #. Translators: Human-readable version of the RFC 822 Date header
 #: src/client/conversation-viewer/conversation-email.vala:557
-#: src/client/util/util-email.vala:245
+#: src/client/util/util-email.vala:261
 msgid "Date:"
 msgstr "Data:"
 
 #. Translators: Human-readable version of the RFC 822 Subject header
 #: src/client/conversation-viewer/conversation-email.vala:567
-#: src/client/util/util-email.vala:243
+#: src/client/util/util-email.vala:259
 msgid "Subject:"
 msgstr "Assunto:"
 
@@ -1917,65 +1845,65 @@ msgstr "%d mais…"
 #. in load_contacts.
 #. Translators: This is displayed in place of the from address
 #. when the message has no from address.
-#: src/client/conversation-viewer/conversation-message.vala:529
+#: src/client/conversation-viewer/conversation-message.vala:556
 msgid "No sender"
 msgstr "Sem remetente"
 
 #. Translators: This separates multiple 'from'
 #. addresses in the compact header for a message.
-#: src/client/conversation-viewer/conversation-message.vala:920
+#: src/client/conversation-viewer/conversation-message.vala:1049
 msgid ", "
 msgstr ", "
 
 #. Translators: This string is used as the HTML IMG ALT
 #. attribute value when displaying an inline image in an email
 #. that did not specify a file name. E.g. <IMG ALT="Image" ...
-#: src/client/conversation-viewer/conversation-message.vala:1040
+#: src/client/conversation-viewer/conversation-message.vala:1171
 msgid "Image"
 msgstr "Imagem"
 
 #. Translators: Info bar status message
-#: src/client/conversation-viewer/conversation-message.vala:1305
+#: src/client/conversation-viewer/conversation-message.vala:1442
 msgid "Remote images not shown"
 msgstr "Imagens remotas não mostradas"
 
 # Traduzido como se fosse uma ação do sistema, porém se possível verificar se isto se trata de uma descrição de tela para o usuário (hint) --Enrico
 #. Translators: Info bar description
-#: src/client/conversation-viewer/conversation-message.vala:1307
+#: src/client/conversation-viewer/conversation-message.vala:1444
 msgid "Only show remote images from senders you trust."
 msgstr "Mostrar somente imagens remotas de remetentes que você confia."
 
 #. Translators: Info bar button label
-#: src/client/conversation-viewer/conversation-message.vala:1311
+#: src/client/conversation-viewer/conversation-message.vala:1448
 msgid "Show"
 msgstr "Mostrar"
 
 #. Translators: Info bar button label
-#: src/client/conversation-viewer/conversation-message.vala:1315
+#: src/client/conversation-viewer/conversation-message.vala:1452
 msgid "Always show from sender"
 msgstr "Mostra sempre do remetente"
 
 #. Translators: Title label for placeholder when no
 #. conversations have been selected.
-#: src/client/conversation-viewer/conversation-viewer.vala:83
+#: src/client/conversation-viewer/conversation-viewer.vala:95
 msgid "No conversations selected"
 msgstr "Não há conversas selecionadas"
 
 #. Translators: Sub-title label for placeholder when no
 #. conversations have been selected.
-#: src/client/conversation-viewer/conversation-viewer.vala:87
+#: src/client/conversation-viewer/conversation-viewer.vala:99
 msgid "Selecting a conversation from the list will display it here"
 msgstr "Se for selecionada uma conversa da lista, ela será mostrada aqui"
 
 #. Translators: Title label for placeholder when multiple
 #. conversations have been selected.
-#: src/client/conversation-viewer/conversation-viewer.vala:96
+#: src/client/conversation-viewer/conversation-viewer.vala:108
 msgid "Multiple conversations selected"
 msgstr "Várias conversas selecionadas"
 
 #. Translators: Sub-title label for placeholder when multiple
 #. conversations have been selected.
-#: src/client/conversation-viewer/conversation-viewer.vala:100
+#: src/client/conversation-viewer/conversation-viewer.vala:112
 msgid "Choosing an action will apply to all selected conversations"
 msgstr "A escolha de uma ação será aplicada a todas as conversas selecionadas"
 
@@ -1983,20 +1911,20 @@ msgstr "A escolha de uma ação será aplicada a todas as conversas selecionadas
 #. conversations have exist in a folder.
 #. Translators: Title label for placeholder when no
 #. conversations have been found in a search.
-#: src/client/conversation-viewer/conversation-viewer.vala:109
-#: src/client/conversation-viewer/conversation-viewer.vala:122
+#: src/client/conversation-viewer/conversation-viewer.vala:121
+#: src/client/conversation-viewer/conversation-viewer.vala:134
 msgid "No conversations found"
 msgstr "Nenhuma conversa encontrada"
 
 #. Translators: Sub-title label for placeholder when no
 #. conversations have exist in a folder.
-#: src/client/conversation-viewer/conversation-viewer.vala:113
+#: src/client/conversation-viewer/conversation-viewer.vala:125
 msgid "This folder does not contain any conversations"
 msgstr "Essa pasta não contém nenhuma conversa"
 
 #. Translators: Sub-title label for placeholder when no
 #. conversations have been found in a search.
-#: src/client/conversation-viewer/conversation-viewer.vala:126
+#: src/client/conversation-viewer/conversation-viewer.vala:138
 msgid "Your search returned no results, try refining your search terms"
 msgstr "Sua busca não retornou resultado, tente refinar os termos da pesquisa"
 
@@ -2425,27 +2353,6 @@ msgstr "Ontem"
 msgid "%A"
 msgstr "%A"
 
-#. / 12 hours format for datetime that a message being replied
-#. / to was received See
-#. / http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/client/util/util-date.vala:218
-msgid "%a, %b %-e, %Y at %l:%M %P"
-msgstr "%a, %-e de %b de %Y às %l:%M %P"
-
-#. / 24 hours format for the datetime that a message being
-#. / replied to was received See
-#. / http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/client/util/util-date.vala:224
-msgid "%a, %b %-e, %Y at %H:%M"
-msgstr "%a, %-e de %b de %Y às %H:%M"
-
-#. / Format for the datetime that a message being replied to
-#. / was received See
-#. / http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/client/util/util-date.vala:230
-msgid "%a, %b %-e, %Y at %X"
-msgstr "%a, %-e de %b de %Y às %X"
-
 #. Translators: Label used when an email has a missing or
 #. an empty subject
 #: src/client/util/util-email.vala:50
@@ -2471,29 +2378,44 @@ msgid_plural "%s and %d others"
 msgstr[0] "%s e %d outro"
 msgstr[1] "%s e %d outros"
 
+#. / GLib g_date_time_format format string for the date and
+#. / time that a message being replied to was
+#. / received. This should be roughly similar to an RFC
+#. / 822-style date header value with optional additional
+#. / punctuation for readability. Note that this date may
+#. / be sent to someone in a different locale than the
+#. / sender, so should be unambiguous (for example, do not
+#. / use mm/dd/yyyy since it could be confused with
+#. / dd/mm/yyyy) and must include the time zone.
+#: src/client/util/util-email.vala:192
+msgid "%a, %b %-e %Y at %X %Z"
+msgstr "%a, %-e de %b de %Y às %X %Z"
+
 #. / The quoted header for a message being replied to.
-#. / %1$s will be substituted for the date, and %2$s will be substituted for
-#. / the original sender.
-#: src/client/util/util-email.vala:193
+#. / %1$s will be substituted for the date, and %2$s
+#. / will be substituted for the original sender.
+#: src/client/util/util-email.vala:198
 #, c-format
 msgid "On %1$s, %2$s wrote:"
 msgstr "Em %1$s, %2$s escreveu:"
 
-#. / The quoted header for a message being replied to (in case the date is not known).
-#. / %s will be replaced by the original sender.
-#: src/client/util/util-email.vala:200
+#. / The quoted header for a message being replied to
+#. / (in case the date is not known).  %s will be
+#. / replaced by the original sender.
+#: src/client/util/util-email.vala:209
 #, c-format
 msgid "%s wrote:"
 msgstr "%s escreveu:"
 
-#. / The quoted header for a message being replied to (in case the sender is not known).
-#. / %s will be replaced by the original date
-#: src/client/util/util-email.vala:206
+#. / The quoted header for a message being replied to
+#. / (in case the sender is not known).  %s will be
+#. / replaced by the original date
+#: src/client/util/util-email.vala:219
 #, c-format
 msgid "On %s:"
 msgstr "Em %s:"
 
-#: src/client/util/util-email.vala:235
+#: src/client/util/util-email.vala:251
 msgid "---------- Forwarded message ----------"
 msgstr "---------- Mensagem encaminhada ----------"
 
@@ -2733,7 +2655,7 @@ msgstr "não-lida"
 #. Draft mailbox. Separate names using a vertical bar and
 #. put the most common localized name to the front for the
 #. default. English names do not need to be included.
-#: src/engine/imap-engine/imap-engine-generic-account.vala:996
+#: src/engine/imap-engine/imap-engine-generic-account.vala:998
 msgid "Drafts | Draft"
 msgstr "Rascunhos | Rascunho"
 
@@ -2741,13 +2663,13 @@ msgstr "Rascunhos | Rascunho"
 #. Sent mailbox. Separate names using a vertical bar and
 #. put the most common localized name to the front for the
 #. default. English names do not need to be included.
-#: src/engine/imap-engine/imap-engine-generic-account.vala:1005
+#: src/engine/imap-engine/imap-engine-generic-account.vala:1007
 msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
 msgstr "Enviados | Correios enviados | E-mails enviados"
 
 #. The localised name(s) of the Sent folder name as used
 #. by MS Outlook/Exchange.
-#: src/engine/imap-engine/imap-engine-generic-account.vala:1010
+#: src/engine/imap-engine/imap-engine-generic-account.vala:1012
 msgctxt "Outlook localised name"
 msgid "Sent Items"
 msgstr "Itens enviados"
@@ -2756,7 +2678,7 @@ msgstr "Itens enviados"
 #. Junk/Spam mailbox. Separate names using a vertical bar
 #. and put the most common localized name to the front for
 #. the default. English names do not need to be included.
-#: src/engine/imap-engine/imap-engine-generic-account.vala:1020
+#: src/engine/imap-engine/imap-engine-generic-account.vala:1022
 msgid ""
 "Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk Mail | Bulk Email "
 "| Bulk E-Mail"
@@ -2766,13 +2688,13 @@ msgstr "Spam | Lixo eletrônico"
 #. Trash mailbox. Separate names using a vertical bar and
 #. put the most common localized name to the front for the
 #. default. English names do not need to be included.
-#: src/engine/imap-engine/imap-engine-generic-account.vala:1030
+#: src/engine/imap-engine/imap-engine-generic-account.vala:1032
 msgid "Trash | Rubbish | Rubbish Bin"
 msgstr "Lixeira | Lixo"
 
 #. The localised name(s) of the Trash folder name as used
 #. by MS Outlook/Exchange.
-#: src/engine/imap-engine/imap-engine-generic-account.vala:1035
+#: src/engine/imap-engine/imap-engine-generic-account.vala:1037
 msgctxt "Outlook localised name"
 msgid "Deleted Items"
 msgstr "Itens excluídos"
@@ -2781,24 +2703,24 @@ msgstr "Itens excluídos"
 #. Archive mailbox. Separate names using a vertical bar
 #. and put the most common localized name to the front for
 #. the default. English names do not need to be included.
-#: src/engine/imap-engine/imap-engine-generic-account.vala:1045
+#: src/engine/imap-engine/imap-engine-generic-account.vala:1047
 msgid "Archive | Archives"
 msgstr ""
 "Arquivo | Arquivos | Arquivado | Arquivados | Arquivamento | Archive | "
 "Archives"
 
-#: src/engine/rfc822/rfc822-message.vala:528
+#: src/engine/rfc822/rfc822-message.vala:544
 #, c-format
 msgid "Could not determine mime type for “%s”."
 msgstr "Não foi possível determinar o tipo mime para “%s”."
 
-#: src/engine/rfc822/rfc822-message.vala:539
+#: src/engine/rfc822/rfc822-message.vala:555
 #, c-format
 msgid "Could not determine content type for mime type “%s” on “%s”."
 msgstr ""
 "Não foi possível determinar o tipo de conteúdo para o tipo mime “%s” em “%s”."
 
-#: src/engine/rfc822/rfc822-message.vala:1013
+#: src/engine/rfc822/rfc822-message.vala:1008
 msgid "(no subject)"
 msgstr "(sem assunto)"
 
@@ -2903,6 +2825,168 @@ msgstr "_Confiar nesse servidor"
 msgid "_Don’t Trust This Server"
 msgstr "_Não confiar nesse servidor"
 
+#: ui/composer-editor.ui:100
+msgid "Bold text"
+msgstr "Negrito"
+
+#: ui/composer-editor.ui:124
+msgid "Italic text"
+msgstr "Itálico"
+
+#: ui/composer-editor.ui:148
+msgid "Underline text"
+msgstr "Sublinhado"
+
+#: ui/composer-editor.ui:172
+msgid "Strikethrough text"
+msgstr "Tachado"
+
+#: ui/composer-editor.ui:205
+msgid "Insert bulleted list"
+msgstr "Insere lista não ordenada"
+
+#: ui/composer-editor.ui:229
+msgid "Insert numbered list"
+msgstr "Insere lista numerada"
+
+#: ui/composer-editor.ui:262
+msgid "Indent or quote text"
+msgstr "Recua ou cita texto"
+
+#: ui/composer-editor.ui:286
+msgid "Un-indent or unquote text"
+msgstr "Remove recuo ou citação de texto"
+
+#: ui/composer-editor.ui:315
+msgid "Remove text formatting"
+msgstr "Remove formatação de texto"
+
+#: ui/composer-editor.ui:334
+msgid "Change font type"
+msgstr "Alterar tipo da fonte"
+
+#: ui/composer-editor.ui:349
+msgid "Sans Serif"
+msgstr "Sans Serif"
+
+#: ui/composer-editor.ui:360
+msgid "Serif"
+msgstr "Serif"
+
+#: ui/composer-editor.ui:371
+msgid "Fixed Width"
+msgstr "Largura fixa"
+
+#: ui/composer-editor.ui:397
+msgid "Change font color"
+msgstr "Alterar cor da fonte"
+
+#: ui/composer-editor.ui:412
+msgid "Change font size"
+msgstr "Alterar tamanho da fonte"
+
+#: ui/composer-editor.ui:447
+msgid "Insert or update text link"
+msgstr "Insere ou atualiza seleção de link"
+
+#: ui/composer-editor.ui:471
+msgid "Insert an image"
+msgstr "Insere uma imagem"
+
+#: ui/composer-editor.ui:513
+msgid "Undo last edit"
+msgstr "Desfaz a última edição"
+
+#: ui/composer-editor.ui:537
+msgid "Redo last edit"
+msgstr "Desfaz a última edição"
+
+#: ui/composer-editor.ui:566 ui/composer-editor.ui:591
+msgid "Attach a file"
+msgstr "Anexa um arquivo"
+
+#: ui/composer-editor.ui:615
+msgid "Add original attachments"
+msgstr "Adiciona anexos originais"
+
+#: ui/composer-editor.ui:660
+msgid "More options"
+msgstr "Mais opções"
+
+#: ui/composer-editor.ui:680
+msgid "Show formatting toolbar"
+msgstr "Mostrar barra de ferramenta de formatação"
+
+#: ui/composer-editor.ui:698
+msgid "Select spell checking languages"
+msgstr "Seleciona idiomas para verificação ortográfica"
+
+#: ui/composer-editor.ui:723
+msgid "S_ans Serif"
+msgstr "S_ans Serif"
+
+#: ui/composer-editor.ui:728
+msgid "S_erif"
+msgstr "S_erif"
+
+#: ui/composer-editor.ui:733
+msgid "_Fixed Width"
+msgstr "Largura _fixa"
+
+#: ui/composer-editor.ui:743
+msgid "_Small"
+msgstr "_Pequeno"
+
+#: ui/composer-editor.ui:748
+msgid "_Medium"
+msgstr "_Médio"
+
+#: ui/composer-editor.ui:753
+msgid "Lar_ge"
+msgstr "_Grande"
+
+#: ui/composer-editor.ui:763
+msgid "_Rich Text"
+msgstr "Texto _rico"
+
+#: ui/composer-editor.ui:768
+msgid "_Plain Text"
+msgstr "Texto si_mples"
+
+#: ui/composer-editor-menus.ui:8
+msgid "_Undo"
+msgstr "_Desfazer"
+
+#: ui/composer-editor-menus.ui:12
+msgid "_Redo"
+msgstr "_Refazer"
+
+#: ui/composer-editor-menus.ui:18 ui/composer-editor-menus.ui:36
+msgid "Cu_t"
+msgstr "Recor_tar"
+
+#: ui/composer-editor-menus.ui:22 ui/composer-editor-menus.ui:40
+#: ui/conversation-message-menus.ui:37
+msgid "_Copy"
+msgstr "_Copiar"
+
+#: ui/composer-editor-menus.ui:26 ui/composer-editor-menus.ui:44
+msgid "_Paste"
+msgstr "_Colar"
+
+#: ui/composer-editor-menus.ui:30
+msgctxt "Clipboard paste as plain text"
+msgid "Paste _Without Formatting"
+msgstr "Colar _sem formatação"
+
+#: ui/composer-editor-menus.ui:50
+msgid "Select _All"
+msgstr "Selecionar _tudo"
+
+#: ui/composer-editor-menus.ui:57 ui/conversation-message-menus.ui:43
+msgid "_Inspect…"
+msgstr "_Inspecionar…"
+
 #: ui/composer-headerbar.ui:23 ui/composer-headerbar.ui:107
 msgid "Detach the composer from the window"
 msgstr "Destaca o compositor da janela"
@@ -2945,40 +3029,6 @@ msgstr "Atualizar"
 msgid "Delete this link"
 msgstr "Exclui esse link"
 
-#: ui/composer-menus.ui:8
-msgid "_Undo"
-msgstr "_Desfazer"
-
-#: ui/composer-menus.ui:12
-msgid "_Redo"
-msgstr "_Refazer"
-
-#: ui/composer-menus.ui:18 ui/composer-menus.ui:36
-msgid "Cu_t"
-msgstr "Recor_tar"
-
-#: ui/composer-menus.ui:22 ui/composer-menus.ui:40
-#: ui/conversation-message-menus.ui:37
-msgid "_Copy"
-msgstr "_Copiar"
-
-#: ui/composer-menus.ui:26 ui/composer-menus.ui:44
-msgid "_Paste"
-msgstr "_Colar"
-
-#: ui/composer-menus.ui:30
-msgctxt "Clipboard paste as plain text"
-msgid "Paste _Without Formatting"
-msgstr "Colar _sem formatação"
-
-#: ui/composer-menus.ui:50
-msgid "Select _All"
-msgstr "Selecionar _tudo"
-
-#: ui/composer-menus.ui:57 ui/conversation-message-menus.ui:43
-msgid "_Inspect…"
-msgstr "_Inspecionar…"
-
 #. Geary account mail will be sent from
 #: ui/composer-widget.ui:61
 msgid "_From"
@@ -3017,134 +3067,6 @@ msgstr "Solte arquivos aqui"
 msgid "To add them as attachments"
 msgstr "Para adicionar eles como anexos"
 
-#: ui/composer-widget.ui:615
-msgid "Bold text"
-msgstr "Negrito"
-
-#: ui/composer-widget.ui:639
-msgid "Italic text"
-msgstr "Itálico"
-
-#: ui/composer-widget.ui:663
-msgid "Underline text"
-msgstr "Sublinhado"
-
-#: ui/composer-widget.ui:687
-msgid "Strikethrough text"
-msgstr "Tachado"
-
-#: ui/composer-widget.ui:720
-msgid "Insert bulleted list"
-msgstr "Insere lista não ordenada"
-
-#: ui/composer-widget.ui:744
-msgid "Insert numbered list"
-msgstr "Insere lista numerada"
-
-#: ui/composer-widget.ui:777
-msgid "Indent or quote text"
-msgstr "Recua ou cita texto"
-
-#: ui/composer-widget.ui:801
-msgid "Un-indent or unquote text"
-msgstr "Remove recuo ou citação de texto"
-
-#: ui/composer-widget.ui:830
-msgid "Remove text formatting"
-msgstr "Remove formatação de texto"
-
-#: ui/composer-widget.ui:849
-msgid "Change font type"
-msgstr "Alterar tipo da fonte"
-
-#: ui/composer-widget.ui:864
-msgid "Sans Serif"
-msgstr "Sans Serif"
-
-#: ui/composer-widget.ui:875
-msgid "Serif"
-msgstr "Serif"
-
-#: ui/composer-widget.ui:886
-msgid "Fixed Width"
-msgstr "Largura fixa"
-
-#: ui/composer-widget.ui:912
-msgid "Change font color"
-msgstr "Alterar cor da fonte"
-
-#: ui/composer-widget.ui:927
-msgid "Change font size"
-msgstr "Alterar tamanho da fonte"
-
-#: ui/composer-widget.ui:962
-msgid "Insert or update text link"
-msgstr "Insere ou atualiza seleção de link"
-
-#: ui/composer-widget.ui:986
-msgid "Insert an image"
-msgstr "Insere uma imagem"
-
-#: ui/composer-widget.ui:1028
-msgid "Undo last edit"
-msgstr "Desfaz a última edição"
-
-#: ui/composer-widget.ui:1052
-msgid "Redo last edit"
-msgstr "Desfaz a última edição"
-
-#: ui/composer-widget.ui:1081 ui/composer-widget.ui:1106
-msgid "Attach a file"
-msgstr "Anexa um arquivo"
-
-#: ui/composer-widget.ui:1130
-msgid "Add original attachments"
-msgstr "Adiciona anexos originais"
-
-#: ui/composer-widget.ui:1175
-msgid "More options"
-msgstr "Mais opções"
-
-#: ui/composer-widget.ui:1195
-msgid "Show formatting toolbar"
-msgstr "Mostrar barra de ferramenta de formatação"
-
-#: ui/composer-widget.ui:1213
-msgid "Select spell checking languages"
-msgstr "Seleciona idiomas para verificação ortográfica"
-
-#: ui/composer-widget.ui:1273
-msgid "S_ans Serif"
-msgstr "S_ans Serif"
-
-#: ui/composer-widget.ui:1278
-msgid "S_erif"
-msgstr "S_erif"
-
-#: ui/composer-widget.ui:1283
-msgid "_Fixed Width"
-msgstr "Largura _fixa"
-
-#: ui/composer-widget.ui:1293
-msgid "_Small"
-msgstr "_Pequeno"
-
-#: ui/composer-widget.ui:1298
-msgid "_Medium"
-msgstr "_Médio"
-
-#: ui/composer-widget.ui:1303
-msgid "Lar_ge"
-msgstr "_Grande"
-
-#: ui/composer-widget.ui:1313
-msgid "_Rich Text"
-msgstr "Texto _rico"
-
-#: ui/composer-widget.ui:1318
-msgid "_Plain Text"
-msgstr "Texto si_mples"
-
 #: ui/components-attachment-pane.ui:29 ui/components-attachment-pane.ui:47
 msgid "Select all attachments"
 msgstr "Seleciona todos os anexos"
@@ -3161,6 +3083,26 @@ msgstr "Abre os anexos selecionados"
 msgid "Save _All"
 msgstr "Salvar _tudo"
 
+#: ui/components-conversation-actions.ui:85
+msgid "Reply"
+msgstr "Responde"
+
+#: ui/components-conversation-actions.ui:108
+msgid "Reply All"
+msgstr "Responde a todos"
+
+#: ui/components-conversation-actions.ui:131
+msgid "Forward"
+msgstr "Encaminha"
+
+#: ui/components-conversation-actions.ui:163
+msgid "_Archive"
+msgstr "_Arquivar"
+
+#: ui/components-conversation-actions.ui:211
+msgid "Toggle find bar"
+msgstr "Ativa/desativa a barra de busca"
+
 #: ui/components-inspector-error-view.ui:31
 msgid ""
 "If the problem is serious or persists, please save and send these details to "
@@ -3698,35 +3640,19 @@ msgctxt "shortcut window"
 msgid "Insert a link"
 msgstr "Insere um link"
 
-#: ui/main-toolbar.ui:24
+#: ui/main-toolbar.ui:85 ui/main-toolbar.ui:179
+msgid "Back"
+msgstr "Voltar"
+
+#: ui/main-toolbar.ui:104
 msgctxt "tooltip"
 msgid "Compose Message"
 msgstr "Escreve mensagem"
 
-#: ui/main-toolbar.ui:62
+#: ui/main-toolbar.ui:122
 msgid "Toggle search bar"
 msgstr "Ativa/desativa a barra de pesquisa"
 
-#: ui/main-toolbar.ui:114
-msgid "Reply"
-msgstr "Responde"
-
-#: ui/main-toolbar.ui:137
-msgid "Reply All"
-msgstr "Responde a todos"
-
-#: ui/main-toolbar.ui:160
-msgid "Forward"
-msgstr "Encaminha"
-
-#: ui/main-toolbar.ui:265
-msgid "Toggle find bar"
-msgstr "Ativa/desativa a barra de busca"
-
-#: ui/main-toolbar.ui:286
-msgid "_Archive"
-msgstr "_Arquivar"
-
 #: ui/main-toolbar-menus.ui:21
 msgid "Toggle as _Junk"
 msgstr "Marcar/desmarcar como li_xo eletrônico"
@@ -3763,6 +3689,72 @@ msgstr "_Autenticar"
 msgid "Geary update in progress…"
 msgstr "Atualização do Geary em progresso…"
 
+#~ msgid "Position of folder list pane"
+#~ msgstr "Posição do painel de lista de pastas"
+
+# O termo "Paned" se refere a gtk.Paned, uma class for painéis.
+# "Grabber" é termo usado no desenvolvimento para função da captura de frame
+#~ msgid "Position of the folder list Paned grabber."
+#~ msgstr "Posição do grabber do Paned da lista de pastas."
+
+#~ msgid "Position of folder list pane when horizontal"
+#~ msgstr "Posição do painel de lista de pastas quando horizontal"
+
+# O termo "Paned" se refere a gtk.Paned, uma class for painéis.
+# "Grabber" é termo usado no desenvolvimento para função da captura de frame
+#~ msgid ""
+#~ "Position of the folder list Paned grabber in the horizontal orientation."
+#~ msgstr ""
+#~ "Posição do grabber do Paned da lista de pastas na orientação horizontal."
+
+#~ msgid "Position of folder list pane when vertical"
+#~ msgstr "Posição do painel de lista de pastas quando vertical"
+
+# O termo "Paned" se refere a gtk.Paned, uma class for painéis.
+# "Grabber" é termo usado no desenvolvimento para função da captura de frame
+#~ msgid ""
+#~ "Position of the folder list Paned grabber in the vertical orientation."
+#~ msgstr ""
+#~ "Posição do grabber do Paned da lista de pastas na orientação vertical."
+
+#~ msgid "Orientation of the folder list pane"
+#~ msgstr "Orientação do painel de lista de pastas"
+
+# O termo "Paned" se refere a gtk.Paned, uma class for painéis.
+# "Grabber" é termo usado no desenvolvimento para função da captura de frame
+#~ msgid "True if the folder list Paned is in the horizontal orientation."
+#~ msgstr ""
+#~ "Verdadeiro se o Paned da lista de pastas estiver na orientação horizontal."
+
+#~ msgid "Position of message list pane"
+#~ msgstr "Posição do painel de lista de mensagens"
+
+# O termo "Paned" se refere a gtk.Paned, uma class for painéis.
+# "Grabber" é termo usado no desenvolvimento para função da captura de frame
+#~ msgid "Position of the message list Paned grabber."
+#~ msgstr "Posição do grabber do Paned da lista de mensagens."
+
+#~ msgid "Use _three pane view"
+#~ msgstr "Usar visão de _três painéis"
+
+#~ msgid "Spacing"
+#~ msgstr "Espaçamento"
+
+#~ msgid "Spacing between children"
+#~ msgstr "Espaçamento entre filhos"
+
+#~ msgid "Row spacing"
+#~ msgstr "Espaçamento de linha"
+
+#~ msgid "Spacing between rows of children"
+#~ msgstr "Espaçamento entre linhas de filhos"
+
+#~ msgid "%a, %b %-e, %Y at %l:%M %P"
+#~ msgstr "%a, %-e de %b de %Y às %l:%M %P"
+
+#~ msgid "%a, %b %-e, %Y at %H:%M"
+#~ msgstr "%a, %-e de %b de %Y às %H:%M"
+
 #~ msgid "Desktop Notifications"
 #~ msgstr "Notificações na área de trabalho"