[evolution] Update Finnish translation



commit 27d5766b69e268240e4b2b0a289602afe73b8f4b
Author: Jiri Grönroos <jiri gronroos iki fi>
Date:   Fri Feb 8 18:37:54 2019 +0000

    Update Finnish translation

 po/fi.po | 4546 +++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 2410 insertions(+), 2136 deletions(-)
---
diff --git a/po/fi.po b/po/fi.po
index ef2ebd1f9d..7f50147955 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -19,8 +19,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/evolution/issues\n";
-"POT-Creation-Date: 2018-08-24 07:14+0000\n"
-"PO-Revision-Date: 2018-09-02 20:45+0300\n"
+"POT-Creation-Date: 2019-01-30 13:46+0000\n"
+"PO-Revision-Date: 2019-02-08 20:37+0200\n"
 "Last-Translator: Jiri Grönroos <jiri gronroos+l10n iki fi>\n"
 "Language-Team: suomi <lokalisointi-lista googlegroups com>\n"
 "Language: fi\n"
@@ -547,19 +547,30 @@ msgid "Number of units for determining when to hide tasks"
 msgstr "Kuinka monta yksikköä tarvitaan, jotta tehtävät piilotetaan."
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:68
-msgid "Hide cancelled tasks"
+#, fuzzy
+#| msgid "Hide cancelled tasks"
+msgid "Hide cancelled events"
 msgstr "Piilota perutut tehtävät"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:69
 #, fuzzy
-msgid "Whether to hide cancelled tasks in the tasks view"
+msgid "Whether to hide cancelled events in the calendar view"
 msgstr "Piilotetaanko valmistuneet tehtävät tehtävänäkymistä."
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:70
+msgid "Hide cancelled tasks"
+msgstr "Piilota perutut tehtävät"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:71
+#, fuzzy
+msgid "Whether to hide cancelled tasks in the tasks view"
+msgstr "Piilotetaanko valmistuneet tehtävät tehtävänäkymistä."
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:72
 msgid "Horizontal pane position"
 msgstr "Vaakapaneelin sijainti"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:71
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:73
 #, fuzzy
 msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the task "
@@ -568,81 +579,81 @@ msgstr ""
 "Vaakapaneelin sijainti pikseleinä, kalenteriselaimen ja tehtävälistan välissä jos "
 "ei olla kuukausinäkymässä."
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:72
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:74
 #, fuzzy
 msgid "Last reminder time"
 msgstr "Viimeisen hälytyksen aika"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:73
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:75
 #, fuzzy
 msgid "Time the last reminder ran, in time_t"
 msgstr "Viimeisimmän hälytyksen suoritusaika, time_t-yksikkönä."
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:74
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:76
 #, fuzzy
 #| msgid "Marcus Bains Line Color - Day View"
 msgid "Marcus Bains Line Color — Day View"
 msgstr "Marcus Bains -viivan väri - päivänäkymä"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:75
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:77
 #, fuzzy
 msgid "Color to draw the Marcus Bains line in the Day View"
 msgstr "Marcus Bains -viivan väri päivänäkymässä."
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:76
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:78
 #, fuzzy
 #| msgid "Marcus Bains Line Color - Time bar"
 msgid "Marcus Bains Line Color — Time bar"
 msgstr "Marcus Bains -viivan väri - aikajana"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:77
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:79
 #, fuzzy
 msgid "Color to draw the Marcus Bains Line in the Time bar (empty for default)"
 msgstr "Väri, jolla Marcus Bains -viiva piirretään aikajanassa (tyhjä oletuksena)."
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:78
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:80
 msgid "Marcus Bains Line"
 msgstr "Marcus Bains -viiva"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:79
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:81
 #, fuzzy
 msgid "Whether to draw the Marcus Bains Line (line at current time) in the calendar"
 msgstr "Piirretäänkö Marcus Bains -viiva (viiva nykyhetkessä) kalenteriin."
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:80
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:82
 msgid "Memo preview pane position (horizontal)"
 msgstr "Muistilappujen esikatselupaneelin sijainti (vaaka)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:81
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:83
 #, fuzzy
 msgid "Position of the task preview pane when oriented horizontally"
 msgstr "Paneelin sijainti sen ollessa vaaka-asennossa"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:82
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:84
 msgid "Memo layout style"
 msgstr "Muistilappujen asettelutyyli"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:83
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:85
 msgid ""
 "The layout style determines where to place the preview pane in relation to the "
 "memo list. “0” (Classic View) places the preview pane below the memo list. "
 "“1” (Vertical View) places the preview pane next to the memo list"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:84
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:86
 msgid "Memo preview pane position (vertical)"
 msgstr "Muistilappujen esikatselupaneelin sijainti (pysty)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:85
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:87
 #, fuzzy
 msgid "Position of the memo preview pane when oriented vertically"
 msgstr "Paneelin sijainti sen ollessa pystyasennossa"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:86
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:88
 msgid "Month view horizontal pane position"
 msgstr "Kuukausinäkymän vaakapaneelin sijainti"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:87
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:89
 #, fuzzy
 msgid ""
 "Position of the horizontal pane, between the view and the date navigator calendar "
@@ -651,57 +662,57 @@ msgstr ""
 "Vaakapaneelin sijainti pikseleinä, kalenteriselaimen ja tehtävälistan välissä "
 "käytettäessä kuukausinäkymää."
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:88
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:90
 #, fuzzy
 msgid "Scroll Month View by a week, not by a month"
 msgstr "Siirrytäänkö kuukausinäkymässä viikoittain, eikä kuukausittain."
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:89
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:91
 #, fuzzy
 msgid "Whether to scroll a Month View by a week, not by a month"
 msgstr "Siirrytäänkö kuukausinäkymässä viikoittain, eikä kuukausittain."
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:90
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:92
 msgid "Preferred New button item"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:91
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:93
 msgid "Name of the preferred New toolbar button item"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:92
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:94
 msgid "Primary calendar"
 msgstr "Ensisijainen kalenteri"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:93
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:95
 msgid ""
 "The UID of the selected (or “primary”) calendar in the sidebar of the “Calendar” "
 "view"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:94
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:96
 msgid "Primary memo list"
 msgstr "Ensisijainen muistilappulista"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:95
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:97
 msgid ""
 "The UID of the selected (or “primary”) memo list in the sidebar of the “Memos” view"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:96
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:98
 msgid "Primary task list"
 msgstr "Ensisijainen tehtävälista"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:97
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:99
 msgid ""
 "The UID of the selected (or “primary”) task list in the sidebar of the “Tasks” view"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:98
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:100
 msgid "Free/busy template URL"
 msgstr "Vapaa/varattu-mallin osoite"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:100
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:102
 #, fuzzy, no-c-format
 msgid ""
 "The URL template to use as a free/busy data fallback, %u is replaced by the user "
@@ -710,152 +721,152 @@ msgstr ""
 "URL-malli, jota käytetään vapaa/varattu-tiedon varaosoitteena. %u korvataan "
 "sähköpostiosoitteen käyttäjäosalla ja %d aluenimellä."
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:101
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:103
 msgid "Recurrent Events in Italic"
 msgstr "Toistuvat tapahtumat kursivoituna"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:102
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:104
 msgid "Show days with recurrent events in italic font in bottom left calendar"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:103
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:105
 msgid "Search range for time-based searching in years"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:104
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:106
 msgid ""
 "How many years can the time-based search go forward or backward from currently "
 "selected day when searching for another occurrence; default is ten years"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:105
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:107
 msgid "Show appointment end times in week and month views"
 msgstr "Näytä tapaamisten loppumisajat viikko- ja kuukausinäkymissä"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:106
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:108
 #, fuzzy
 msgid "Whether to display the end time of events in the week and month views"
 msgstr "Näytetäänkö tapahtumien loppumisaika viikko- ja kuukausinäkymissä."
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:107
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:109
 #, fuzzy
 #| msgid "Show appointment end times in week and month views"
 msgid "Show appointment icons in the month view"
 msgstr "Näytä tapaamisten loppumisajat viikko- ja kuukausinäkymissä"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:108
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:110
 #, fuzzy
 msgid "Whether to show icons of events in the month view"
 msgstr "Näytetäänkö tapahtumien loppumisaika viikko- ja kuukausinäkymissä."
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:109
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:111
 msgid "Show the memo preview pane"
 msgstr "Näytä muistilappujen esikatselupaneeli"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:110
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:112
 #, fuzzy
 msgid "If “true”, show the memo preview pane in the main window"
 msgstr "Näytä muistilappujen esikatselupaneeli"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:111
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:113
 msgid "Show the task preview pane"
 msgstr "Näytä tehtävien esikatselupaneeli"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:112
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:114
 #, fuzzy
 msgid "If “true”, show the task preview pane in the main window"
 msgstr "Näytä tehtävien esikatselupaneeli"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:113
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:115
 msgid "Show week numbers in Day View, Work Week View, and Date Navigator"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:114
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:116
 #, fuzzy
 msgid "Whether to show week numbers in various places in the Calendar"
 msgstr "Näytetäänkö viikkonumerot päivämääräselaimessa."
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:115
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:117
 #, fuzzy
 msgid "Vertical position for the tag pane"
 msgstr "Pystysijainti"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:116
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:118
 msgid "Highlight tasks due today"
 msgstr "Korosta tänään erääntyvät tehtävät"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:117
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:119
 msgid "Whether highlight tasks due today with a special color (task-due-today-color)"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:118
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:120
 msgid "Tasks due today color"
 msgstr "Tänään erääntyvien tehtävien väri"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:119
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:121
 #, fuzzy
 msgid ""
 "Background color of tasks that are due today, in “#rrggbb” format. Used together "
 "with task-due-today-highlight"
 msgstr "Tänään erääntyvien tehtävien väri, \"#rrggbb\"-muodossa."
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:120
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:122
 msgid "Task preview pane position (horizontal)"
 msgstr "Tehtävien esikatselupaneelin sijainti (vaaka)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:121
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:123
 msgid "Task layout style"
 msgstr "Tehtävien asettelutapa"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:122
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:124
 msgid ""
 "The layout style determines where to place the preview pane in relation to the "
 "task list. “0” (Classic View) places the preview pane below the task list. "
 "“1” (Vertical View) places the preview pane next to the task list"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:123
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:125
 msgid "Task preview pane position (vertical)"
 msgstr "Tehtävien esikatselupaneelin sijainti (pysty)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:124
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:126
 #, fuzzy
 msgid "Position of the task preview pane when oriented vertically"
 msgstr "Paneelin sijainti sen ollessa pystyasennossa"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:125
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:127
 msgid "Highlight overdue tasks"
 msgstr "Korosta eräpäivän ylittäneet tehtävät"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:126
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:128
 msgid "Whether highlight overdue tasks with a special color (task-overdue-color)"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:127
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:129
 msgid "Overdue tasks color"
 msgstr "Eräpäivän ylittäneiden tehtävien väri"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:128
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:130
 #, fuzzy
 msgid ""
 "Background color of tasks that are overdue, in “#rrggbb” format. Used together "
 "with task-overdue-highlight."
 msgstr "Eräpäivän ylittäneiden tehtävien väri, \"#rrggbb\"-muodossa."
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:129
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:131
 msgid "Time divisions"
 msgstr "Aikajaot"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:130
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:132
 #, fuzzy
 msgid "Intervals shown in Day and Work Week views, in minutes"
 msgstr "Päivä- ja viikkonäkymissä näytettävät aikavälit minuutteina."
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:131
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:133
 msgid "Timezone"
 msgstr "Aikavyöhyke"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:132
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:134
 #, fuzzy
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
@@ -864,109 +875,109 @@ msgstr ""
 "Oletusaikavyöhyke käytettävissä päivämäärissä ja kalenterissa, muodossa "
 "kääntämätön Olsenin aikavyöhyketietokantamuoto, esimerkiksi \"Finland/Helsinki\"."
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:133
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:135
 msgid "Twenty four hour time format"
 msgstr "24 tunnin kello"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:134
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:136
 #, fuzzy
 msgid "Whether to show times in twenty four hour format instead of using am/pm"
 msgstr "Näytetäänkö kello 24 tunnin vai am/pm-muodossa."
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:135
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:137
 msgid "Birthday and anniversary reminder"
 msgstr "Syntymä- ja vuosipäivämuistutus"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:136
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:138
 #, fuzzy
 msgid "Whether to set a reminder for birthdays and anniversaries"
 msgstr "Asetetaanko tapaamisille oletusmuistutus."
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:137
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:139
 msgid "Default appointment reminder"
 msgstr "Tapaamisen oletusmuistutus"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:138
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:140
 #, fuzzy
 msgid "Whether to set a default reminder for appointments"
 msgstr "Asetetaanko tapaamisille oletusmuistutus."
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:139
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:141
 msgid "Use system timezone"
 msgstr "Käytä järjestelmän aikavyöhykettä"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:140
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:142
 msgid "Use the system timezone instead of the timezone selected in Evolution"
 msgstr "Käytä järjestelmän aikavyöhykettä Evolutionista valitun sijasta"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:141
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:143
 msgid "First day of the week"
 msgstr "Viikon ensimmäinen päivä"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:142
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:144
 msgid "Monday is a work day"
 msgstr "Maanantai on työpäivä"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:143
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:145
 msgid "Tuesday is a work day"
 msgstr "Tiistai on työpäivä"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:144
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:146
 msgid "Wednesday is a work day"
 msgstr "Keskiviikko on työpäivä"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:145
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:147
 msgid "Thursday is a work day"
 msgstr "Torstai on työpäivä"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:146
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:148
 msgid "Friday is a work day"
 msgstr "Perjantai on työpäivä"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:147
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:149
 msgid "Saturday is a work day"
 msgstr "Lauantai on työpäivä"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:148
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:150
 msgid "Sunday is a work day"
 msgstr "Sunnuntai on työpäivä"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:149
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:151
 msgid "Create events, memos and tasks as Private by default"
 msgstr "Luo tapahtumat, muistiinpanot ja tehtävät yksityisenä oletuksena"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:150
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:152
 msgid "Draw events as flat, not shaded."
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:151
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:153
 msgid ""
 "Whether to order days in the Week View from left to right, rather than from top to "
 "bottom."
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:152
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:154
 msgid ""
 "Allow direct edit of event Summary when clicking on it in the Day, Work Week, Week "
 "or Month view."
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:153
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:155
 #, fuzzy
 msgid "(Deprecated) First day of the week, from Sunday (0) to Saturday (6)"
 msgstr "Viikonpäivä josta viikko alkaa, sunnuntaista (0) lauantaihin (6)."
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:154
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:156
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use “week-"
 "start-day-name” instead."
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:155
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:157
 msgid "(Deprecated) Work days"
 msgstr "(Vanhennettu) Työpäivät"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:156
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:158
 msgid ""
 "Days on which the start and end of work hours should be indicated. (This key was "
 "deprecated in version 3.10 and should no longer be used. Use the “work-day-"
@@ -1189,11 +1200,29 @@ msgstr "Luettelo oikoluvun käyttämistä sanaston kielikoodeista."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:33
 #, fuzzy
+#| msgid "Spell checking languages"
+msgid "List of recently used spell checking languages"
+msgstr "Oikoluvun kielet"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:34
+#, fuzzy
+#| msgid "List of dictionary language codes used for spell checking."
+msgid ""
+"List of dictionary language codes used for spell checking, which had been used "
+"recently."
+msgstr "Luettelo oikoluvun käyttämistä sanaston kielikoodeista."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:35
+msgid "How many recently used spell checking languages to remember"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:36
+#, fuzzy
 #| msgid "Show \"Bcc\" field when sending a mail message"
 msgid "Show “Bcc” field when sending a mail message"
 msgstr "Näytä \"Bcc\"-kenttä lähetettäessä sähköpostia"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:34
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:37
 #, fuzzy
 #| msgid ""
 #| "Show the \"Bcc\" field when sending a mail message. This is controlled from the "
@@ -1205,13 +1234,13 @@ msgstr ""
 "Näytä \"Bcc\"-kenttä lähetettäessä sähköpostia. Tätä asetusta ohjataan Näytä-"
 "valikosta, kun sähköpostitili on valittu."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:35
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:38
 #, fuzzy
 #| msgid "Show \"Cc\" field when sending a mail message"
 msgid "Show “Cc” field when sending a mail message"
 msgstr "Näytä \"Cc\"-kenttä lähetettäessä sähköpostia"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:36
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:39
 #, fuzzy
 #| msgid ""
 #| "Show the \"Cc\" field when sending a mail message. This is controlled from the "
@@ -1223,13 +1252,13 @@ msgstr ""
 "Näytä \"Cc\"-kenttä lähetettäessä sähköpostia. Tätä asetusta ohjataan Näytä-"
 "valikosta, kun sähköpostitili on valittu."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:37
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:40
 #, fuzzy
 #| msgid "Show \"Cc\" field when sending a mail message"
 msgid "Show “From” override field when sending a mail message"
 msgstr "Näytä \"Cc\"-kenttä lähetettäessä sähköpostia"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:38
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:41
 #, fuzzy
 #| msgid ""
 #| "Show the \"Cc\" field when sending a mail message. This is controlled from the "
@@ -1241,13 +1270,13 @@ msgstr ""
 "Näytä \"Cc\"-kenttä lähetettäessä sähköpostia. Tätä asetusta ohjataan Näytä-"
 "valikosta, kun sähköpostitili on valittu."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:39
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:42
 #, fuzzy
 #| msgid "Show \"Reply To\" field when sending a mail message"
 msgid "Show “Reply To” field when sending a mail message"
 msgstr "Näytä \"Reply To\"-kenttä lähetettäessä sähköpostia"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:40
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:43
 #, fuzzy
 #| msgid ""
 #| "Show the \"Reply To\" field when sending a mail message. This is controlled "
@@ -1259,13 +1288,13 @@ msgstr ""
 "Näytä \"Reply To\"-kenttä lähetettäessä sähköpostia. Tätä asetusta ohjataan Näytä-"
 "valikosta, kun sähköpostitili on valittu."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:41
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:44
 #, fuzzy
 #| msgid "Show \"From\" field when posting to a newsgroup"
 msgid "Show “From” field when posting to a newsgroup"
 msgstr "Näytä \"From\"-kenttä lähetettäessä uutisryhmään"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:42
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:45
 #, fuzzy
 #| msgid ""
 #| "Show the \"From\" field when posting to a newsgroup. This is controlled from "
@@ -1277,13 +1306,13 @@ msgstr ""
 "Näytä \"From\"-kenttä lähetettäessä uutisryhmään. Tätä asetusta ohjataan Näytä-"
 "valikosta, kun sähköpostitili on valittu."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:43
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:46
 #, fuzzy
 #| msgid "Show \"Reply To\" field when posting to a newsgroup"
 msgid "Show “Reply To” field when posting to a newsgroup"
 msgstr "Näytä \"Reply To\"-kenttä lähetettäessä uutisryhmään"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:44
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:47
 #, fuzzy
 #| msgid ""
 #| "Show the \"Reply To\" field when posting to a newsgroup. This is controlled "
@@ -1295,23 +1324,23 @@ msgstr ""
 "Näytä \"Reply To\"-kenttä lähetettäessä uutisryhmään. Tätä asetusta ohjataan Näytä-"
 "valikosta, kun sähköpostitili on valittu."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:45
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:48
 msgid "Digitally sign replies when the original message is signed"
 msgstr ""
 "Allekirjoita digitaalisesti vastaukset, kun alkuperäinen viesti on allekirjoitettu"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:46
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:49
 msgid ""
 "Automatically enable PGP or S/MIME signatures when replying to a message which is "
 "also PGP or S/MIME signed."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:47
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:50
 #, fuzzy
 msgid "Encode filenames in an Outlook/GMail way"
 msgstr "Muotoile tiedostonimet Outlookin ja GMailin tapaan."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:48
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:51
 #, fuzzy
 msgid ""
 "Encode filenames in the mail headers same as Outlook or GMail do, to let them "
@@ -1323,32 +1352,32 @@ msgstr ""
 "merkistön merkkejä. Nämä ohjelmat eivät noudata standardia RFC 2231, vaan "
 "käyttävät virheellistä standardia RFC 2047."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:49
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:52
 #, fuzzy
 msgid "Send messages through Outbox folder"
 msgstr "Tallennetaan viestiä kansioon"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:50
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:53
 msgid ""
 "Always save messages to Outbox folder when sending, to let a user choose when the "
 "messages should be sent."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:51
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:54
 msgid "Include signature in new messages only"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:52
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:55
 msgid ""
 "Include selected signature only for new messages, but have no signature added for "
 "Replies or Forwards."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:53
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:56
 msgid "Put personalized signatures at the top of replies"
 msgstr "Lisää oma allekirjoitus vastauksen alkuun"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:54
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:57
 msgid ""
 "Users get all up in arms over where their signature should go when replying to a "
 "message. This determines whether the signature is placed at the top of the message "
@@ -1358,31 +1387,31 @@ msgstr ""
 "vastattaessa viestiin. Tämä asetus määrittää, lisätäänkö se viestin alkuun vai "
 "loppuun."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:55
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:58
 msgid "Do not add signature delimiter"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:56
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:59
 msgid ""
 "Set to TRUE in case you do not want to add signature delimiter before your "
 "signature when composing a mail."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:57
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:60
 msgid "Keep original message signature in replies"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:58
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:61
 msgid ""
 "When set to TRUE, keep original message signature in replies, otherwise strip the "
 "signature and everything below it when replying to the message."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:59
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:62
 msgid "Ignore list Reply-To:"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:60
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:63
 msgid ""
 "Some mailing lists set a Reply-To: header to trick users into sending replies to "
 "the list, even when they ask Evolution to make a private reply. Setting this "
@@ -1392,105 +1421,127 @@ msgid ""
 "by comparing the Reply-To: header with a List-Post: header, if there is one."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:61
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:64
 msgid "List of localized “Re”"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:62
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:65
 msgid ""
 "Comma-separated list of localized “Re” abbreviations to skip in a subject text "
 "when replying to a message, as an addition to the standard “Re” prefix. An example "
 "is “SV,AV”."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:63
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:66
 msgid "List of localized “Re” separators"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:64
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:67
 msgid ""
 "A list of localized “Re” separators, used to skip in a subject text when replying "
 "to a message, as an addition to the standard “:” and the Unicode “︰” separators."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:65
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:68
 msgid "Use localized “Fwd”/“Re” in message Subject"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:66
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:69
 msgid ""
 "When set to true, uses localized “Fwd”/“Re” in message Subject on reply and "
 "forward as provided by current locale translation, otherwise uses unlocalized "
 "version."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:67
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:70
 msgid "Number of characters for wrapping"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:68
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:71
 msgid "Will autowrap lines after given number of characters."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:69
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:72
 msgid "Number of To and CC recipients to ask “prompt-on-many-to-cc-recips” from"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:70
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:73
 msgid "When to ask, when the number of To and CC recipients reaches this value."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:71
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:74
 msgid "Whether to always show Sign and Encrypt buttons on the toolbar"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:72
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:75
 msgid ""
 "If set to “true”, the Sign and Encrypt buttons for either PGP or S/MIME are always "
 "shown in the composer’s toolbar. Otherwise they are shown only when being used."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:73
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:76
 msgid "Wrap quoted text in replies"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:74
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:77
 msgid "If set to “true” quoted text in replies will be wrapped."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:75
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:78
 msgid "Convert UTC time in reply credits to local time"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:76
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:79
 msgid ""
 "Whether the time in reply credits should be converted to local time when it’s in "
 "UTC in the message."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:77
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
+#, fuzzy
+#| msgid "Failed to mark messages as read."
+msgid "Mark replied to messages as read"
+msgstr "Viestien merkitseminen luetuiksi epäonnistui."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:81
+msgid ""
+"When replying to a message and marking it as being replied to, then whether also "
+"mark it as read."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:82
+msgid "Whether start Plain Text composer with Preformatted paragraph mode"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:83
+msgid ""
+"When set to true, new Plain Text messages will have preselected Preformatted "
+"paragraph mode. The Normal paragraph mode will be used when set to false."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:84
 msgid "Whether to obey Content-Disposition:inline message header hint"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:78
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:85
 msgid ""
 "Set to “false” to block automatic display of attachments with Content-Disposition: "
 "inline."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:79
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:86
 msgid "Save file format for drag-and-drop operation"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:87
 msgid "Can be either “mbox” or “pdf”."
 msgstr "Voi olla joko “mbox” tai “pdf”."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:81
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:88
 msgid "Show image animations"
 msgstr "Näytä kuvien animaatiot"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:82
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:89
 msgid ""
 "Enable animated images in HTML mail. Many users find animated images annoying and "
 "prefer to see a static image instead."
@@ -1498,21 +1549,21 @@ msgstr ""
 "Näytä animoidut kuvat HTML-viesteissä. Monista käyttäjistä animoidut kuvat ovat "
 "ärsyttäviä ja he haluavat nähdä kuvat ilman animaatioita."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:83
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:90
 msgid "Enable or disable type ahead search feature"
 msgstr "Käytetäänkö kirjoituksenaikaista hakua"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:84
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:91
 msgid ""
 "Enable the side bar search feature to allow interactive searching of folder names."
 msgstr ""
 "Ota sivupalkin hakutoiminto käyttöön etsiäksesi kansionimiä interaktiivisesti."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:85
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:92
 msgid "Enable or disable magic space bar"
 msgstr "Käytetäänkö maagista välilyöntinäppäintä"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:86
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:93
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list and "
 "folders."
@@ -1520,197 +1571,197 @@ msgstr ""
 "Käytä tätä, jos kaluat käyttää välilyöntinäppäintä siirtyäksesi viestin "
 "esikatselussa, viestiluettelossa ja kansioluettelossa."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:87
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:94
 msgid "Enable to use a similar message list view settings for all folders"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:88
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:95
 #, fuzzy
 msgid "Enable to use a similar message list view settings for all folders."
 msgstr ""
 "Käytä tätä, jos kaluat käyttää välilyöntinäppäintä siirtyäksesi viestin "
 "esikatselussa, viestiluettelossa ja kansioluettelossa."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:89
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:96
 #, fuzzy
 #| msgid "Mark citations in the message \"Preview\""
 msgid "Mark citations in the message “Preview”"
 msgstr "Merkitse lainaukset viestin \"esikatselussa\""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:90
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:97
 #, fuzzy
 #| msgid "Mark citations in the message \"Preview\"."
 msgid "Mark citations in the message “Preview”."
 msgstr "Merkitse lainaukset viestin \"esikatselussa\"."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:91
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:98
 msgid "Citation highlight color"
 msgstr "Lainauksen korostusväri"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:92
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
 msgid "Citation highlight color."
 msgstr "Lainauksen korostukseen käytetty väri."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:93
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:100
 msgid "Enable/disable caret mode"
 msgstr "Kytke/poista caret-tila"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:94
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:101
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "Kytke caret-tila, jolloin näet kursorin lukiessasi sähköpostia."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:95
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:102
 msgid "Default charset in which to display messages"
 msgstr "Viestejä näytettäessä oletuksena käytetty merkistö"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:96
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:103
 msgid "Default charset in which to display messages."
 msgstr "Viestejä näytettäessä oletuksena käytetty merkistö."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:97
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:104
 msgid "Automatically load images for HTML messages over HTTP"
 msgstr "Lataa HTML-viestien kuvat HTTP:n yli"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:98
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
 msgid "Show notification about missing remote content"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:106
 msgid ""
 "When the message preview shows a message which requires to download remote "
 "content, while the download is not allowed for the user or the site, then show a "
 "notification about it on top of the preview panel."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:100
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
 msgid "Show Animations"
 msgstr "Näytä animaatiot"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:101
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:108
 msgid "Show animated images as animations."
 msgstr "Näytä animoidut kuvat animaatioina."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:102
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
 msgid "Show all message headers"
 msgstr "Näytä kaikki otsakkeet"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:103
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:110
 msgid "Show all the headers when viewing a messages."
 msgstr "Näytä kaikki viestin otsakkeet näytettäessä viestiä."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:104
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:111
 msgid "List of headers to show when viewing a message."
 msgstr "Luettelo otsakkeista, jotka näytetään viestiä katsellessa."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:112
 msgid ""
 "Each header is represented as a pair: the header name, and a boolean indicating "
 "whether the header is enabled. Disabled headers are not shown when viewing a "
 "message, but are still listed in Preferences."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:106
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:113
 msgid "Show photo of the sender"
 msgstr "Näytä lähettäjän valokuva"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:114
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "Näytä lähettäjän kuva viesti-ikkunan lukupaneelissa."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:108
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:115
 msgid "Search gravatar.com for photo of the sender"
 msgstr "Näytä lähettäjän valokuvaa gravatar.comista"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:116
 msgid "Allow searching also at gravatar.com for photo of the sender."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:110
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
 msgid "Mark as Seen after specified timeout"
 msgstr "Merkitse nähdyksi määritellyn viiveen jälkeen"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:111
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:118
 msgid "Mark as Seen after specified timeout."
 msgstr "Merkitse nähdyksi määritellyn viiveen jälkeen."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:112
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:119
 #, fuzzy
 #| msgid "Mark as Seen after specified timeout"
 msgid "Mark as Seen always after specified timeout"
 msgstr "Merkitse nähdyksi määritellyn viiveen jälkeen"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:113
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
 msgid ""
 "If set to true, the selected message will be set as unread after the timeout also "
 "after the folder change."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:114
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:121
 #, fuzzy
 msgid "Timeout for marking messages as seen"
 msgstr "Aikakatkaisu merkittäessä viestejä nähdyiksi"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:115
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
 #, fuzzy
 msgid "Timeout in milliseconds for marking messages as seen."
 msgstr "Aikakatkaisu merkittäessä viestejä nähdyiksi."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:116
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:123
 msgid "Show Attachment Bar"
 msgstr "Näytä liitepalkki"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
 msgid ""
 "Show Attachment Bar below the message preview pane when the message has "
 "attachments."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:118
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:125
 msgid "Sender email-address column in the message list"
 msgstr "Näytä lähettäjän sähköposti viestiluettelossa"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:119
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
 msgid ""
 "Show the email-address of the sender in a separate column in the message list."
 msgstr "Näytä lähettäjän sähköpostiosoite viestiluettelossa erillisessä sarakkeessa."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:127
 msgid "Show deleted messages in the message-list"
 msgstr "Näytä poistetut viestit viestiluettelossa"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:121
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "Näytä poistetut viestit yliviivattuna viestiluettelossa."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:129
 #, fuzzy
 #| msgid "Show deleted messages in the message-list"
 msgid "Show junk messages in the message-list"
 msgstr "Näytä poistetut viestit viestiluettelossa"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:123
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
 #, fuzzy
 #| msgid "Show deleted messages (with a strike-through) in the message-list."
 msgid "Show junk messages (with a red strike-through) in the message-list."
 msgstr "Näytä poistetut viestit yliviivattuna viestiluettelossa."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:131
 #, fuzzy
 #| msgid "Enable search folders"
 msgid "Enable Unmatched search folder"
 msgstr "Ota hakunäkymät käyttöön"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:125
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
 msgid ""
 "Enable Unmatched search folder within Search Folders. It does nothing if Search "
 "Folders are disabled."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "Piilottaa kansiokohtaisen esikatselun ja poistaa valinnan"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:127
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:134
 #, fuzzy
 #| msgid ""
 #| "This key is read only once and reset to \"false\" after read. This unselects "
@@ -1722,66 +1773,66 @@ msgstr ""
 "Tämä avain luetaan kerran, ja nollataan arvoksi \"false\" lukemisen jälkeen.  Tämä "
 "peruu sähköpostin valinnan luettelosta ja poistaa esikatselun kansiolta."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:135
 msgid "Height of the message-list pane"
 msgstr "Viestiluettelon korkeus"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:129
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:136
 msgid "Height of the message-list pane."
 msgstr "Viestiluettelopaneelin korkeus."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:137
 msgid "Whether message headers are collapsed in the user interface"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:131
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:138
 msgid "Width of the message-list pane"
 msgstr "Viestiluettelopaneelin leveys"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:139
 msgid "Width of the message-list pane."
 msgstr "Viestiluettelopaneelin leveys."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
 msgid "Layout style"
 msgstr "Asettelutyyli"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:134
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:141
 msgid ""
 "The layout style determines where to place the preview pane in relation to the "
 "message list. “0” (Classic View) places the preview pane below the message list. "
 "“1” (Vertical View) places the preview pane next to the message list."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:135
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
 msgid "Variable width font"
 msgstr "Vaihtuvanlevyinen fontti"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:136
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:143
 msgid "The variable width font for mail display."
 msgstr "Vaihtelevan levyinen fontti viestejä näytettäessä."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:137
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:144
 msgid "Terminal font"
 msgstr "Päätteen fontti"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:138
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:145
 msgid "The terminal font for mail display."
 msgstr "Päätefontti viestejä näytettäessä."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:139
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:146
 msgid "Use custom fonts"
 msgstr "Käytä omia fontteja"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:147
 msgid "Use custom fonts for displaying mail."
 msgstr "Käytä omia fontteja näytettäessä viestejä."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:141
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:148
 msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "Rajaa näytettäviä To-, Cc- ja Bcc-osoitteita"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:149
 msgid ""
 "Compress display of addresses in TO/CC/BCC to the number specified in "
 "address_count."
@@ -1789,11 +1840,11 @@ msgstr ""
 "Rajaa To-, Cc- ja Bcc-kentissä näytettävien osoitteiden lukumäärä avaimessa "
 "address_count määrättyyn arvoon."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:143
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "To-, Cc- ja Bcc-osoitteiden näytettävä lukumäärä"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:144
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:151
 #, fuzzy
 #| msgid ""
 #| "This sets the number of addresses to show in default message list view, beyond "
@@ -1805,24 +1856,24 @@ msgstr ""
 "Tämä asettaa viestiluettelon oletusnäkymässä näytettävien viestin lukumäärän, "
 "jonka jälkeen näytetään '...'."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:145
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:152
 #, fuzzy
 #| msgid "Show message preview below the message list"
 msgid "Show mails in headers part of the message preview when name is available"
 msgstr "Näytä viestin esikatselu viestiluettelon alla"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:146
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:153
 msgid ""
 "When set to false, the mail addresses which contain both the name and the email "
 "parts in headers like To/Cc/Bcc will be shown only with the name part, without the "
 "actual email, with the name made clickable."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:147
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
 msgid "Thread the message-list based on Subject"
 msgstr "Säikeistä viestiluettelo aiheen perusteella"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:148
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:155
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do not "
 "contain In-Reply-To or References headers."
@@ -1830,11 +1881,11 @@ msgstr ""
 "Palataanko viestien säikeistämiseen otsikon perusteella, jos otsakkeet eivät "
 "sisällä In-Reply-To tai References-otsakkeita."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:149
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:156
 msgid "Default value for thread expand state"
 msgstr "Säikeen laajennuksen tilan oletusarvo"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:157
 msgid ""
 "This setting specifies whether the threads should be in expanded or collapsed "
 "state by default. Evolution requires a restart."
@@ -1842,11 +1893,11 @@ msgstr ""
 "Tämä asetus määrittää, laajennetaanko vai supistetaanko säikeet oletuksena. Muutos "
 "vaatii Evolutionin uudelleenkäynnistyksen."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:151
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
 msgid "Whether sort threads based on latest message in that thread"
 msgstr "Järjestetäänkö säikeet säikeen viimeisen viestin mukaan"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:152
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:159
 #, fuzzy
 #| msgid ""
 #| "This setting specifies whether the threads should be sorted based on latest "
@@ -1860,11 +1911,11 @@ msgstr ""
 "Tämä asetus määrittää, järjestetäänkö säikeet säikeen viimeisen viestin mukaan "
 "viestin päiväyksen sijasta. Muutos vaatii Evolutionin uudelleenkäynnistyksen."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:153
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
 msgid "Whether sort thread children always ascending"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:161
 #, fuzzy
 #| msgid ""
 #| "This setting specifies whether the threads should be sorted based on latest "
@@ -1877,109 +1928,115 @@ msgstr ""
 "Tämä asetus määrittää, järjestetäänkö säikeet säikeen viimeisen viestin mukaan "
 "viestin päiväyksen sijasta. Muutos vaatii Evolutionin uudelleenkäynnistyksen."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:155
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:162
 msgid "Sort accounts alphabetically in a folder tree"
 msgstr "Järjestä tilit aakkosjärjestyksessä kansiopuuhun"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:156
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:163
 msgid ""
 "Tells how to sort accounts in a folder tree used in a Mail view. When set to true "
 "accounts are sorted alphabetically, with an exception of On This Computer and "
 "Search folders, otherwise accounts are sorted based on an order given by a user"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:157
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:164
 msgid "Log filter actions"
 msgstr "Kirjaa suodatintoimenpiteet"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:165
 msgid "Log filter actions to the specified log file."
 msgstr "Kirjaa suodattimien toimenpiteet määriteltyyn lokitiedostoon."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:159
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
 msgid "Logfile to log filter actions"
 msgstr "Lokitiedosto suodattimien toimenpiteille"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:167
 msgid ""
 "If not set, or being “stdout”, then the logging is done to stdout, instead to a "
 "file."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:161
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
 msgid "Flush Outbox after filtering"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:162
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:169
 msgid ""
 "Whether to flush Outbox after filtering is done. Outbox flush will happen only "
 "when there was used any “Forward to” filter action and approximately one minute "
 "after the last action invocation."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:163
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
 msgid "Default forward style"
 msgstr "Välityksen oletustyyli"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:164
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:171
 msgid "Default reply style"
 msgstr "Vastauksen oletustyyli"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:165
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
+msgid ""
+"Forward and reply attribution language tag, like en_US. Empty string means to use "
+"the same language as the user interface."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:173
 msgid "Prompt on send when using key accelerator (Ctrl+Enter)"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
 #, fuzzy
 #| msgid "Prompt the user when he or she tries to send a message without a Subject."
 msgid ""
 "Prompt the user when he or she tries to send a message with a key accelerator."
 msgstr "Kysy vahvistus, jos yritetään lähettää viestiä tyhjällä aihe-otsakkeella."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:167
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:175
 msgid "Prompt on empty subject"
 msgstr "Kysy vahvistus, jos viestin aihe on tyhjä"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
 msgid "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "Kysy vahvistus, jos yritetään lähettää viestiä tyhjällä aihe-otsakkeella."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:169
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:177
 msgid "Prompt when emptying the trash"
 msgstr "Kysy vahvistus roskakoria tyhjennettäessä"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:178
 msgid "Prompt the user when he or she tries to empty the trash."
 msgstr "Kysy vahvistus käyttäjältä, kun roskakoria ollaan tyhjentämässä."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:171
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
 msgid "Prompt when user expunges"
 msgstr "Kysy vahvistus, kun käyttäjä siivoaa poistettuja"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Kysy vahvistus, kun kansioista siivotaan pysyvästi poistettuja viestejä."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:173
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:181
 #, fuzzy
 #| msgid "Prompt when user expunges"
 msgid "Prompt when user calls Empty Junk"
 msgstr "Kysy vahvistus, kun käyttäjä siivoaa poistettuja"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:182
 #, fuzzy
 #| msgid "Prompt the user when he or she tries to expunge a folder."
 msgid "Prompt the user when he or she tries to Empty a Junk folder."
 msgstr "Kysy vahvistus, kun kansioista siivotaan pysyvästi poistettuja viestejä."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:175
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:183
 #, fuzzy
 msgid "Prompt before sending to recipients not entered as mail addresses"
 msgstr ""
 "Seuraavia vastaanottajia ei tunnistettu kelvollisiksi sähköpostiosoitteiksi:\n"
 "{0}"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
 #, fuzzy
 msgid ""
 "It disables/enables the repeated prompts to warn that you are trying to send a "
@@ -1988,20 +2045,20 @@ msgstr ""
 "Määrittää annetaanko toistuvia  varoituksia viestien poistosta hakunäkymistä ja "
 "siitä, että viesti poistetaan pysyvästi, ei vain hakutuloksista."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:177
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:185
 msgid "Prompt when user only fills Bcc"
 msgstr "Kysy vahvistus, jos käyttäjä syöttää ainoastaan Bcc-kentän"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:178
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
 "Varmista, kun käyttäjä yrittää lähettää viestiä ilman Vastaanottaja tai Cc-kenttiä."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Kysy vahvistus, jos yritetään lähteä ei-toivottua HTML-postia"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -2009,11 +2066,11 @@ msgstr ""
 "Kysy vahvistus, kun ollaan lähettämässä HTML-viestiä vastaanottajille, jotka eivät "
 "sellaista halua vastaanottaa."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:181
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "Kysy kun käyttäjä yrittää avata kymmenen tai useampia kerralla"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:182
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if they "
 "really want to do it."
@@ -2021,19 +2078,19 @@ msgstr ""
 "Jos yrität avata 10 tai useampia viestejä kerralla, kysytään haluatko todella "
 "tehdä sen."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:183
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
 msgid "Prompt while marking multiple messages"
 msgstr "Kysy vahvistus merkittäessä useita viestejä"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:192
 msgid "Enable or disable the prompt whilst marking multiple messages."
 msgstr "Näytetäänkö kehto merkittäessä useita viestejä."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:185
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
 msgid "Prompt when deleting messages in search folder"
 msgstr "Kysy poistettaessa viestejä hakukansiosta"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:194
 msgid ""
 "It disables/enables the repeated prompts to warn that deleting messages from a "
 "search folder permanently deletes the message, not simply removing it from the "
@@ -2042,34 +2099,34 @@ msgstr ""
 "Määrittää annetaanko toistuvia  varoituksia viestien poistosta hakunäkymistä ja "
 "siitä, että viesti poistetaan pysyvästi, ei vain hakutuloksista."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:195
 msgid "Asks whether to copy a folder by drag &amp; drop in the folder tree"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:196
 msgid ""
 "Possible values are: “never” — do not allow copy with drag &amp; drop of folders "
 "in folder tree, “always” — allow copy with drag &amp; drop of folders in folder "
 "tree without asking, or “ask” — (or any other value) will ask user."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
 msgid "Asks whether to move a folder by drag &amp; drop in the folder tree"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:198
 msgid ""
 "Possible values are: “never” — do not allow move with drag &amp; drop of folders "
 "in folder tree, “always” — allow move with drag &amp; drop of folders in folder "
 "tree without asking, or “ask” — (or any other value) will ask user."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
 #, fuzzy
 msgid "Prompt when replying privately to list messages"
 msgstr "Kysy vahvistus merkittäessä useita viestejä"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:192
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:200
 #, fuzzy
 msgid ""
 "It disables/enables the repeated prompts to warn that you are sending a private "
@@ -2078,24 +2135,24 @@ msgstr ""
 "Määrittää annetaanko toistuvia  varoituksia viestien poistosta hakunäkymistä ja "
 "siitä, että viesti poistetaan pysyvästi, ei vain hakutuloksista."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:201
 #, fuzzy
 msgid "Prompt when mailing list hijacks private replies"
 msgstr "Kysy vahvistus merkittäessä useita viestejä"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:194
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:202
 msgid ""
 "It disables/enables the repeated prompts to warn that you are trying sending a "
 "private reply to a message which arrived via a mailing list, but the list sets a "
 "Reply-To: header which redirects your reply back to the list"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:195
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:203
 #, fuzzy
 msgid "Prompt when replying to many recipients"
 msgstr "Vahvista viestin lähetys, jos ainoastaan Bcc-vastaanottajia on määritelty"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:196
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:204
 #, fuzzy
 msgid ""
 "It disables/enables the repeated prompts to warn that you are sending a reply to "
@@ -2104,7 +2161,7 @@ msgstr ""
 "Poistaa käytöstä ominaisuuden, joka kysyy useita kertoja vaaditaanko synkronointia "
 "yhteydettömään tilaan siirryttäessä."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:205
 #, fuzzy
 msgid ""
 "Prompt when switching composer format and the content needs to lose its formatting"
@@ -2112,7 +2169,7 @@ msgstr ""
 "Määrittää annetaanko toistuvia  varoituksia viestien poistosta hakunäkymistä ja "
 "siitä, että viesti poistetaan pysyvästi, ei vain hakutuloksista."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:198
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:206
 #, fuzzy
 msgid ""
 "It disables/enables the repeated prompts to warn that you are switching composer "
@@ -2121,57 +2178,57 @@ msgstr ""
 "Määrittää annetaanko toistuvia  varoituksia viestien poistosta hakunäkymistä ja "
 "siitä, että viesti poistetaan pysyvästi, ei vain hakutuloksista."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:207
 #, fuzzy
 msgid "Prompt when sending to many To and CC recipients"
 msgstr "Vahvista viestin lähetys, jos ainoastaan Bcc-vastaanottajia on määritelty"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:200
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:208
 msgid ""
 "Enable or disable the prompt when sending to many To and CC recipients. The "
 "“composer-many-to-cc-recips-num” defines the threshold."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:201
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:209
 msgid ""
 "Policy for automatically closing the message browser window when forwarding or "
 "replying to the displayed message."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:202
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:210
 msgid "Empty Trash folders on exit"
 msgstr "Tyhjennä roskakorit lopetettaessa"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:203
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:211
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Tyhjennä kaikki roskakorit kun Evolution suljetaan."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:204
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:212
 msgid "Minimum days between emptying the trash on exit"
 msgstr "Lyhin aika päivinä, jonka kuluttua roskakori tyhjennetään suljettaessa"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:205
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:213
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "Vähimmäisaika roskakorin tyhjennysten välillä (päiviä)."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:206
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:214
 msgid "Last time Empty Trash was run"
 msgstr "Roskakori tyhjennettiin viimeksi"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:207
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:215
 #, fuzzy
 msgid "The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
 msgstr "Viimeisimmän roskakorin tyhjennyksen unix-aikaleima."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:208
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:216
 msgid "Amount of time in seconds the error should be shown on the status bar."
 msgstr "Aika sekunteina, kuinka pitkään virheet näytetään tilarivillä."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:209
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:217
 msgid "Level beyond which the message should be logged."
 msgstr "Taso, jonka jälkeen viesti kirjoitetaan lokiin."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:210
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:218
 #, fuzzy
 #| msgid ""
 #| "This can have three possible values. \"0\" for errors. \"1\" for warnings. "
@@ -2183,24 +2240,24 @@ msgstr ""
 "Tällä asetuksella voi olla kolme arvoa: \"0\" (ei virheitä), \"1\" (varoitukset) "
 "tai \"2\" (vianetsintäviestit)."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:211
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:219
 #, fuzzy
 #| msgid "Show original \"Date\" header value."
 msgid "Show original “Date” header value."
 msgstr "Näytä alkuperäinen \"Date\"-otsakearvo."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:212
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:220
 msgid ""
 "Show the original “Date” header (with a local time only if the time zone differs). "
 "Otherwise always show “Date” header value in a user preferred format and local "
 "time zone."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:213
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:221
 msgid "List of Labels and their associated colors"
 msgstr "Merkinnät ja niihin liittyvät värit"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:214
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:222
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains strings "
 "containing name:color where color uses the HTML hex encoding."
@@ -2208,45 +2265,45 @@ msgstr ""
 "Evolutionin sähköpostiosan tuntemat etiketit. Luettelo sisältää nimi:väri pareja, "
 "joissa väri on määritelty HTML-värien heksadesimaalisessa muodossa."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:215
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:223
 msgid "Check incoming mail being junk"
 msgstr "Etsi roskapostia saapuvista sähköposteista"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:216
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:224
 msgid "Run junk test on incoming mail."
 msgstr "Suorita roskapostitarkistus saapuvalle postille."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:217
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:225
 msgid "Empty Junk folders on exit"
 msgstr "Tyhjennä roskapostikansiot lopetettaessa"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:218
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:226
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "Tyhjennä kaikki roskapostikansiot kun Evolution suljetaan."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:219
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:227
 msgid "Minimum days between emptying the junk on exit"
 msgstr "Lyhin aika päivinä, jonka kuluttua roskapostit poistetaan suljettaessa"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:220
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:228
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr "Lyhin aika jonka kuluttua roskapostit poistetaan suljettaessa, arvo päivinä."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:221
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:229
 #, fuzzy
 msgid "Last time Empty Junk was run"
 msgstr "Viimeisin kerta, kun roskapostikansiot tyhjennettiin"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:222
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:230
 #, fuzzy
 msgid "The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
 msgstr "Viimeisimmän roskapostien poistokerran unix-aikaleima."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:223
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:231
 msgid "The default plugin for Junk hook"
 msgstr "Roskapostikäsittelijän oletuslisäosa"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:224
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:232
 #, fuzzy
 #| msgid ""
 #| "This is the default junk plugin, even though there are multiple plugins "
@@ -2260,11 +2317,11 @@ msgstr ""
 "Tämä on roskapostin käsittelyn oletuslisäosa, vaikka useita olisi käytössä. Jos "
 "oletuslisäosa ei ole käytössä, ei palata käyttämään muita käytössä olevia lisäosia."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:225
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:233
 msgid "Determines whether to lookup in address book for sender email"
 msgstr "Määrittää, etsitäänkö osoitekirjasta lähettäjän sähköpostiosoitetta"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:226
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:234
 #, fuzzy
 #| msgid ""
 #| "Determines whether to lookup the sender email in address book. If found, it "
@@ -2280,7 +2337,7 @@ msgstr ""
 "valittu automaattista täydennystä varten. Tämä haku voi olla hidas, jos osoitteita "
 "täydennetään esimerkiksi LDAP-osoitekirjoista."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:227
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:235
 msgid ""
 "Determines whether to look up addresses for junk filtering in local address book "
 "only"
@@ -2288,7 +2345,7 @@ msgstr ""
 "Määrittää, etsitäänkö lähettäjän sähköpostiosoitetta roskapostin suodatusta varten "
 "vain paikallisista osoitekirjoista"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:228
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:236
 msgid ""
 "This option is related to the key lookup_addressbook and is used to determine "
 "whether to look up addresses in local address book only to exclude mail sent by "
@@ -2298,11 +2355,11 @@ msgstr ""
 "etsitäänkö paikallisesta osoitekirjasta tunnettuja osoitteita, joille ei tehdä "
 "roskapostisuodatusta."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:229
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:237
 msgid "Determines whether to use custom headers to check for junk"
 msgstr "Määrittää käytetäänkö omia roskapostiotsakkeita roskapostin tunnistamiseen"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:230
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:238
 msgid ""
 "Determines whether to use custom headers to check for junk. If this option is "
 "enabled and the headers are mentioned, it will be improve the junk checking speed."
@@ -2310,11 +2367,11 @@ msgstr ""
 "Määrittää käytetäänkö omia roskapostiotsakkeita. Jos tämä valinta on käytössä ja "
 "otsakkeet on annettu, voidaan tällä nopeuttaa roskapostin tunnistamista."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:231
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:239
 msgid "Custom headers to use while checking for junk."
 msgstr "Omat otsakkeet, joiden perusteella roskaposti tunnistetaan."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:232
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:240
 #, fuzzy
 #| msgid ""
 #| "Custom headers to use while checking for junk. The list elements are string in "
@@ -2326,52 +2383,52 @@ msgstr ""
 "Määrittää oman otsakkeen, josta roskapostiviestejä tunnistetaan. Luettelon kohdat "
 "ovat muodossa \"otsakenimi=arvo\"."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:233
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:241
 msgid "UID string of the default account."
 msgstr "Oletustilin UID-merkkijono."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:234
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:242
 msgid "Save directory"
 msgstr "Tallenna kansio"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:235
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:243
 msgid "Directory for saving mail component files."
 msgstr "Kansio, johon sähköpostin osatiedostot tallennetaan."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:236
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:244
 msgid "Composer load/attach directory"
 msgstr "Viesti-ikkunan lataus- ja liitekansio"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:237
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:245
 msgid "Directory for loading/attaching files to composer."
 msgstr "Kansio, josta sähköpostin liitteitä etsitään."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:238
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:246
 msgid "Check for new messages on start"
 msgstr "Tarkista uudet viestit käynnistyksen yhteydessä"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:239
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:247
 msgid ""
 "Whether to check for new messages when Evolution is started. This includes also "
 "sending messages from Outbox."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:240
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:248
 msgid "Check for new messages in all active accounts"
 msgstr "Tarkista uudet viestit kaikilta aktiivisilta tileiltä"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:241
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:249
 msgid ""
 "Whether to check for new messages in all active accounts regardless of the account "
 "“Check for new messages every X minutes” option when Evolution is started. This "
 "option is used only together with “send_recv_on_start” option."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:242
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:250
 msgid "Server synchronization interval"
 msgstr "Palvelimen synkronoinnin aikaväli"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:243
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:251
 msgid ""
 "Controls how frequently local changes are synchronized with the remote mail "
 "server. The interval must be at least 30 seconds."
@@ -2379,13 +2436,13 @@ msgstr ""
 "Määrittää kuinka usein paikalliset muutokset synkronoidaan postipalvelimelle. "
 "Aikavälin täytyy olla vähintään 30 sekuntia."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:244
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:252
 #, fuzzy
 #| msgid "Confirm _when expunging a folder"
 msgid "Allow expunge in virtual folders"
 msgstr "_Varmista viestien lopullinen siivous kansiosta"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:245
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:253
 msgid ""
 "Enables Expunge in virtual folders, which means that the Folder→Expunge will be "
 "callable in virtual folders, while the expunge itself will be done in all folders "
@@ -2393,187 +2450,187 @@ msgid ""
 "belonging to the virtual folder."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:246
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:254
 #: ../src/mail/mail-config.ui.h:9
 msgid "Inherit theme colors in HTML format"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:247
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:255
 msgid ""
 "When enabled the theme colors for background, text and links are sent in resulting "
 "HTML formatted message."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:248
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:256
 msgid "An Archive folder for On This Computer folders."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:249
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:257
 msgid ""
 "An Archive folder to use for Messages|Archive... feature when in an On This "
 "Computer folder."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:250
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:258
 #, fuzzy
 msgid "Whether the To Do bar is visible in the main window"
 msgstr "Näytetäänkö tapahtumien loppumisaika viikko- ja kuukausinäkymissä."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:251
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:259
 msgid "Stores whether the To Do bar is visible in the main window."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:252
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:260
 #, fuzzy
 msgid "Width of the To Do bar in the main window"
 msgstr "Näytä muistilappujen esikatselupaneeli"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:253
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:261
 #, fuzzy
 #| msgid "Apply the given geometry to the main window"
 msgid "Holds the width of the To Do bar for the main window."
 msgstr "Käytä annettua muotoa pääikkunalle"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:254
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:262
 #, fuzzy
 #| msgid "Whether the toolbar should be visible."
 msgid "Whether the To Do bar is visible in a sub-window"
 msgstr "Näytetäänkö työkalupalkki."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:255
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:263
 msgid "Stores whether the To Do bar is visible in a sub-window."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:256
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:264
 msgid "Width of the To Do bar in a sub-window"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:257
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:265
 msgid "Holds the width of the To Do bar for a sub-window."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:258
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:266
 #, fuzzy
 #| msgid "Whether the toolbar should be visible."
 msgid "Whether the To Do bar should show also completed tasks"
 msgstr "Näytetäänkö työkalupalkki."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:259
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:267
 msgid "Stores whether the To Do bar should show also completed tasks."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:260
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:268
 #, fuzzy
 #| msgid "Whether the toolbar should be visible."
 msgid "Whether the To Do bar should show also tasks without Due date"
 msgstr "Näytetäänkö työkalupalkki."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:261
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:269
 #, fuzzy
 #| msgid "Whether the toolbar should be visible."
 msgid "Stores whether the To Do bar should show also tasks without Due date."
 msgstr "Näytetäänkö työkalupalkki."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:262
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:270
 msgid "Show start up wizard"
 msgstr "Näytä käynnistyksen avustaja"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:263
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:271
 msgid "Whether show start up wizard when there is no mail account configured."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:264
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:272
 msgid "Whether go to the previous message after message deletion"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:265
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:273
 msgid ""
 "If set to true, goes to the previous message when the selected is deleted; or to "
 "the next message, when it’s set to false."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:266
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:274
 msgid "Show Subject above Sender in Messages column"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:267
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:275
 msgid ""
 "Whether to show Subject above Sender (From/To) in the Messages column, usually "
 "shown in the Vertical/Wide view of the message list"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:268
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:276
 msgid "Visually wrap long lines in composer"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:269
-#: ../src/composer/e-composer-actions.c:552
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:277
+#: ../src/composer/e-composer-actions.c:542
 msgid "Whether to visually wrap long lines of text to avoid horizontal scrolling"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:270
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:278
 #, fuzzy
 #| msgid "Default reply style"
 msgid "Alternative reply style"
 msgstr "Vastauksen oletustyyli"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:271
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:279
 msgid "Format message in HTML"
 msgstr "Muotoile viesti HTML:nä"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:272
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:280
 #, fuzzy
 #| msgid "Put the cursor at the bottom of replies"
 msgid "Put the cursor at the bottom of alternative replies"
 msgstr "Aseta osoitin viestin loppuun vastattaessa"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:273
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:281
 msgid ""
 "This determines whether the cursor is placed at the top of the message or the "
 "bottom when using Alternative Reply."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:274
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:282
 msgid "Apply chosen template when using Alternative Reply"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:275
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:283
 msgid "Last chosen template’s folder URI for Alternative Reply"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:276
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:284
 msgid "Last chosen template’s message UID for Alternative Reply"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:277
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:285
 msgid ""
 "Whether preserve original message subject when applying template for Alternative "
 "Reply"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:278
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:286
 msgid ""
 "Whether set “body” in mailto: URI as Preformatted paragraph style. If set to "
 "“false”, then Normal paragraph style will be used."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:279
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:287
 msgid ""
 "Close the message browser window when the selected message is deleted or marked as "
 "Junk."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:280
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:288
 msgid ""
 "Collapse archive folders in Move/Copy message to Folder and Go to Folder selectors."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:281
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:289
 msgid ""
 "Where to lookup recipient S/MIME certificates or PGP keys when encrypting messages."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:282
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:290
 msgid ""
 "The “off” value completely disables certificate lookup; the “autocompleted” value "
 "provides certificates only for auto-completed contacts; the “books” value uses "
@@ -2581,61 +2638,72 @@ msgid ""
 "completion."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:283
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:291
+#, fuzzy
+msgid "Whether Send/Receive should also download of messages for offline."
+msgstr "_Nouda viestit yhteydettömään käyttöön"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:292
+msgid ""
+"If enabled, whenever Send/Receive is run it also runs synchronization of messages "
+"for offline use. The option is disabled by default."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:293
 #, fuzzy
 #| msgid "Default forward style"
 msgid "(Deprecated) Default forward style"
 msgstr "Välityksen oletustyyli"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:284
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:294
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use “forward-"
 "style-name” instead."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:285
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:295
 #, fuzzy
 #| msgid "Default reply style"
 msgid "(Deprecated) Default reply style"
 msgstr "Vastauksen oletustyyli"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:286
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:296
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use “reply-"
 "style-name” instead."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:287
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:297
 #, fuzzy
 #| msgid "List of custom headers and whether they are enabled."
 msgid "(Deprecated) List of custom headers and whether they are enabled."
 msgstr "Luettelo omista otsakkeista ja tieto siitä ovatko ne käytössä."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:288
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:298
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use “show-"
 "headers” instead."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:289
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:299
 #, fuzzy
 #| msgid "Load images for HTML messages over HTTP"
 msgid "(Deprecated) Load images for HTML messages over HTTP"
 msgstr "Lataa HTML-viestien kuvat käyttäen HTTP:ta"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:290
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:300
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use “image-"
 "loading-policy” instead."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:291
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:301
 msgid ""
 "(Deprecated) Asks whether to close the message window when the user forwards or "
 "replies to the message shown in the window"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:292
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:302
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use “browser-"
 "close-on-reply-policy” instead."
@@ -2961,7 +3029,7 @@ msgstr ""
 msgid "Compression filter used when compressing attached directories with autoar."
 msgstr ""
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:11 ../src/shell/main.c:317
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:11 ../src/shell/main.c:318
 msgid "Start in offline mode"
 msgstr "Aloita yhteydettömässä tilassa"
 
@@ -3087,6 +3155,16 @@ msgid ""
 "preselected in the file chooser."
 msgstr ""
 
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:38
+msgid "Prefix of the URI to use to search the web with selected text."
+msgstr ""
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:39
+msgid ""
+"The prefix of a URL to be used for searches on the web. The actual text selection "
+"is escaped and appended to this string. The URI should start with https://.";
+msgstr ""
+
 #: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:1
 msgid "Use only local spam tests."
 msgstr "Käytä ainoastaan paikallisia roskapostin tarkistuksia."
@@ -3132,19 +3210,19 @@ msgid ""
 "to take into effect, like using right-click→Format As→...."
 msgstr ""
 
-#: ../data/org.gnome.Evolution.appdata.xml.in.h:1
-#: ../data/org.gnome.Evolution.desktop.in.in.h:1 ../src/mail/e-mail-browser.c:1190
+#: ../data/org.gnome.Evolution.appdata.xml.in.in.h:1
+#: ../data/org.gnome.Evolution.desktop.in.in.h:1 ../src/mail/e-mail-browser.c:1224
 #: ../src/modules/mailto-handler/evolution-mailto-handler.c:208
 #: ../src/shell/e-shell-window-private.c:240
 msgid "Evolution"
 msgstr "Evolution"
 
-#: ../data/org.gnome.Evolution.appdata.xml.in.h:2
+#: ../data/org.gnome.Evolution.appdata.xml.in.in.h:2
 #: ../data/org.gnome.Evolution.desktop.in.in.h:4
 msgid "Manage your email, contacts and schedule"
 msgstr "Hallitse sähköposteja, yhteystietoja ja ajan käyttöä"
 
-#: ../data/org.gnome.Evolution.appdata.xml.in.h:3
+#: ../data/org.gnome.Evolution.appdata.xml.in.in.h:3
 msgid ""
 "Evolution is a personal information management application that provides "
 "integrated mail, calendaring and address book functionality."
@@ -3152,7 +3230,7 @@ msgstr ""
 "Evolution on henkilökohtaisen tiedon hallintasovellus, joka tarjoaa sähköpostin, "
 "kalenterin ja osoitekirjan."
 
-#: ../data/org.gnome.Evolution.appdata.xml.in.h:4
+#: ../data/org.gnome.Evolution.appdata.xml.in.in.h:4
 msgid ""
 "Evolution supports a wide range of industry standard data formats and network "
 "protocols for information exchange, with an emphasis on standards compliance and "
@@ -3164,7 +3242,17 @@ msgstr ""
 "noudattamiseen ja tietoturvaan. Evolution voi myös integroitua Microsoft Exchange -"
 "palvelimeen Exchange Web Services (EWS) -laajennuksen avulla."
 
-#: ../data/org.gnome.Evolution.desktop.in.in.h:2 ../src/shell/e-shell-utils.c:362
+#: ../data/org.gnome.Evolution.appdata.xml.in.in.h:5
+#, fuzzy
+#| msgid ""
+#| "Thanks\n"
+#| "The Evolution Team\n"
+msgid "The Evolution Team"
+msgstr ""
+"Kiitos\n"
+"Evolution-tiimi\n"
+
+#: ../data/org.gnome.Evolution.desktop.in.in.h:2 ../src/shell/e-shell-utils.c:352
 msgid "Groupware Suite"
 msgstr "Ryhmätyöohjelmisto"
 
@@ -3195,7 +3283,7 @@ msgstr "Yhteystiedot"
 
 #: ../data/org.gnome.Evolution.desktop.in.in.h:9
 #: ../src/addressbook/gui/widgets/eab-contact-formatter.c:845
-#: ../src/e-util/e-collection-account-wizard.c:581 ../src/e-util/e-send-options.c:544
+#: ../src/e-util/e-collection-account-wizard.c:784 ../src/e-util/e-send-options.c:544
 #: ../src/e-util/e-webdav-browser.c:469
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:199
 #: ../src/modules/calendar/e-cal-shell-view.c:604
@@ -3208,13 +3296,13 @@ msgstr "Kalenteri"
 #: ../src/mail/importers/kmail-importer.c:251
 #: ../src/mail/importers/pine-importer.c:423
 #: ../src/modules/mail/e-mail-shell-view.c:1483
-#: ../src/smime/gui/certificate-manager.c:1682
+#: ../src/smime/gui/certificate-manager.c:1666
 msgid "Mail"
 msgstr "Sähköposti"
 
 #: ../data/org.gnome.Evolution.desktop.in.in.h:11
-#: ../src/calendar/gui/e-memo-table.c:368 ../src/e-util/e-webdav-browser.c:459
-#: ../src/modules/calendar/e-cal-shell-content.c:1719
+#: ../src/calendar/gui/e-memo-table.c:374 ../src/e-util/e-webdav-browser.c:459
+#: ../src/modules/calendar/e-cal-shell-content.c:1736
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:196
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:211
 #: ../src/modules/calendar/e-memo-shell-view.c:335
@@ -3222,12 +3310,12 @@ msgid "Memos"
 msgstr "Muistilaput"
 
 #: ../data/org.gnome.Evolution.desktop.in.in.h:12
-#: ../src/calendar/gui/e-task-table.c:697 ../src/calendar/gui/print.c:2408
+#: ../src/calendar/gui/e-task-table.c:697 ../src/calendar/gui/print.c:2417
 #: ../src/calendar/importers/icalendar-importer.c:77
 #: ../src/calendar/importers/icalendar-importer.c:1109
 #: ../src/e-util/e-webdav-browser.c:460
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:70
-#: ../src/modules/calendar/e-cal-shell-content.c:1679
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:71
+#: ../src/modules/calendar/e-cal-shell-content.c:1696
 #: ../src/modules/calendar/e-task-shell-view-actions.c:220
 #: ../src/modules/calendar/e-task-shell-view-actions.c:235
 #: ../src/modules/calendar/e-task-shell-view.c:507
@@ -3448,18 +3536,18 @@ msgstr ""
 #: ../src/addressbook/addressbook.error.xml.h:31
 #: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:9
 #: ../src/addressbook/gui/widgets/eab-contact-merging.c:721
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1433
-#: ../src/e-util/e-accounts-window.c:1562
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1505
+#: ../src/e-util/e-accounts-window.c:1563
 #: ../src/e-util/e-mail-signature-manager.c:328
 #: ../src/e-util/e-name-selector-dialog.c:1033 ../src/e-util/filter.ui.h:25
 #: ../src/mail/e-mail-account-manager.c:719 ../src/mail/e-mail-label-manager.c:371
-#: ../src/mail/em-folder-properties.c:1023 ../src/mail/em-vfolder-editor-rule.c:408
-#: ../src/mail/em-vfolder-editor-rule.c:637 ../src/mail/mail-config.ui.h:61
-#: ../src/modules/mail/em-composer-prefs.c:422
-#: ../src/plugins/attachment-reminder/attachment-reminder.c:543
-#: ../src/plugins/email-custom-header/email-custom-header.c:837
+#: ../src/mail/em-folder-properties.c:1044 ../src/mail/em-vfolder-editor-rule.c:408
+#: ../src/mail/em-vfolder-editor-rule.c:637 ../src/mail/mail-config.ui.h:63
+#: ../src/modules/mail/em-composer-prefs.c:423
+#: ../src/plugins/attachment-reminder/attachment-reminder.c:544
+#: ../src/plugins/email-custom-header/email-custom-header.c:838
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:33
-#: ../src/plugins/templates/templates.c:462
+#: ../src/plugins/templates/templates.c:464
 msgid "_Add"
 msgstr "_Lisää"
 
@@ -3549,6 +3637,24 @@ msgstr ""
 msgid "Failed to refresh list of account address books"
 msgstr "Osoitekirjan “{0}” päivittäminen epäonnistui"
 
+#: ../src/addressbook/addressbook.error.xml.h:49
+#, fuzzy
+#| msgid "Do you want to recover unfinished messages?"
+msgid "Do you want to unset contact image?"
+msgstr "Haluatko palauttaa viimeistelemättömät viestit?"
+
+#: ../src/addressbook/addressbook.error.xml.h:50
+#, fuzzy
+#| msgid "Do _Not Unsubscribe"
+msgid "Do _Not Unset"
+msgstr "_Älä peru tilausta"
+
+#: ../src/addressbook/addressbook.error.xml.h:51
+#, fuzzy
+#| msgid "_Unsort"
+msgid "_Unset"
+msgstr "Poista _järjestys"
+
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:1
 msgid "Show Telephone"
 msgstr "Näytä puhelin"
@@ -3606,24 +3712,25 @@ msgid "Show Certificates"
 msgstr "Näytä varmenteet"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:12
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:725
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:747
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3108
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:726
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:748
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3109
 msgid "Contact Editor"
 msgstr "Yhteystietojen muokkain"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:13
 #: ../src/calendar/gui/e-comp-editor-page-reminders.c:1985
-#: ../src/mail/mail-config.ui.h:38
+#: ../src/mail/mail-config.ui.h:40
 msgid "Options"
 msgstr "Asetukset"
 
 #. This is only shown if the EActivity has a GCancellable.
 #. no flags
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:14
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3271
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3504
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4321
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3272
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3502
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4334
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4340
 #: ../src/addressbook/gui/contact-editor/e-contact-editor-fullname.c:220
 #: ../src/addressbook/gui/contact-editor/e-contact-quick-add.c:453
 #: ../src/addressbook/gui/contact-editor/fullname.ui.h:14
@@ -3634,63 +3741,66 @@ msgstr "Asetukset"
 #: ../src/addressbook/gui/widgets/e-addressbook-view.c:1360
 #: ../src/calendar/gui/e-cal-dialogs.c:694
 #: ../src/calendar/gui/e-comp-editor-page-recurrence.c:301
-#: ../src/composer/e-composer-actions.c:229 ../src/e-util/e-activity-bar.c:357
-#: ../src/e-util/e-attachment-dialog.c:309 ../src/e-util/e-attachment-store.c:664
-#: ../src/e-util/e-attachment-store.c:832 ../src/e-util/e-attachment-view.c:302
-#: ../src/e-util/e-categories-dialog.c:80 ../src/e-util/e-category-editor.c:140
-#: ../src/e-util/e-category-editor.c:211 ../src/e-util/e-charset-combo-box.c:99
-#: ../src/e-util/e-collection-account-wizard.c:1586
-#: ../src/e-util/e-collection-account-wizard.c:1821
-#: ../src/e-util/e-color-chooser-widget.c:125 ../src/e-util/e-filter-datespec.c:289
-#: ../src/e-util/e-html-editor-actions.c:321
-#: ../src/e-util/e-html-editor-actions.c:415
-#: ../src/e-util/e-image-chooser-dialog.c:169
+#: ../src/composer/e-composer-actions.c:228 ../src/e-util/e-activity-bar.c:357
+#: ../src/e-util/e-attachment-dialog.c:309 ../src/e-util/e-attachment-store.c:658
+#: ../src/e-util/e-attachment-store.c:668 ../src/e-util/e-attachment-store.c:848
+#: ../src/e-util/e-attachment-store.c:854 ../src/e-util/e-attachment-view.c:301
+#: ../src/e-util/e-categories-dialog.c:80 ../src/e-util/e-category-editor.c:171
+#: ../src/e-util/e-category-editor.c:259 ../src/e-util/e-charset-combo-box.c:99
+#: ../src/e-util/e-collection-account-wizard.c:231
+#: ../src/e-util/e-collection-account-wizard.c:1801
+#: ../src/e-util/e-collection-account-wizard.c:2037
+#: ../src/e-util/e-color-chooser-widget.c:125 ../src/e-util/e-filter-datespec.c:300
+#: ../src/e-util/e-html-editor-actions.c:304
+#: ../src/e-util/e-html-editor-actions.c:348
+#: ../src/e-util/e-html-editor-actions.c:430
+#: ../src/e-util/e-image-chooser-dialog.c:179
 #: ../src/e-util/e-mail-signature-script-dialog.c:366 ../src/e-util/e-passwords.c:468
 #: ../src/e-util/e-rule-context.c:816 ../src/e-util/e-rule-editor.c:187
 #: ../src/e-util/e-rule-editor.c:298 ../src/e-util/e-rule-editor.c:933
 #: ../src/e-util/e-send-options.ui.h:16 ../src/e-util/e-source-config-dialog.c:360
 #: ../src/e-util/e-source-selector-dialog.c:370 ../src/e-util/e-table-config.c:548
 #: ../src/e-util/e-table-config.ui.h:3 ../src/e-util/e-timezone-dialog.ui.h:2
-#: ../src/e-util/evolution-source-viewer.c:835 ../src/e-util/e-web-view.c:4143
+#: ../src/e-util/evolution-source-viewer.c:835 ../src/e-util/e-web-view.c:4318
 #: ../src/e-util/gal-view-instance-save-as-dialog.c:267
 #: ../src/mail/e-mail-config-window.c:334 ../src/mail/e-mail-label-dialog.c:194
-#: ../src/mail/e-mail-tag-editor.c:160 ../src/mail/em-composer-utils.c:3960
+#: ../src/mail/e-mail-tag-editor.c:160 ../src/mail/em-composer-utils.c:4175
 #: ../src/mail/em-folder-selector.c:318 ../src/mail/mail-config.ui.h:2
-#: ../src/mail/mail.error.xml.h:16 ../src/mail/mail-send-recv.c:844
-#: ../src/mail/mail-send-recv.c:925 ../src/mail/mail-vfolder-ui.c:149
+#: ../src/mail/mail.error.xml.h:16 ../src/mail/mail-send-recv.c:874
+#: ../src/mail/mail-send-recv.c:955 ../src/mail/mail-vfolder-ui.c:149
 #: ../src/mail/mail-vfolder-ui.c:271
 #: ../src/modules/accounts-window/e-accounts-window-editors.c:277
 #: ../src/modules/backup-restore/evolution-backup-tool.c:936
 #: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:409
 #: ../src/modules/calendar/e-cal-attachment-handler.c:283
 #: ../src/plugins/email-custom-header/org-gnome-email-custom-header.ui.h:3
-#: ../src/plugins/face/face.c:295
+#: ../src/plugins/face/face.c:298
 #: ../src/plugins/publish-calendar/publish-calendar.c:789
 #: ../src/plugins/publish-calendar/url-editor-dialog.c:419
-#: ../src/plugins/save-calendar/save-calendar.c:185
+#: ../src/plugins/save-calendar/save-calendar.c:186
 #: ../src/shell/e-shell-content.c:641 ../src/shell/e-shell-content.c:748
-#: ../src/shell/e-shell-utils.c:70 ../src/shell/e-shell-utils.c:139
-#: ../src/smime/gui/certificate-manager.c:665
-#: ../src/smime/gui/certificate-manager.c:742
-#: ../src/smime/gui/certificate-manager.c:966
-#: ../src/smime/gui/certificate-manager.c:1348 ../src/smime/gui/e-cert-selector.c:235
+#: ../src/shell/e-shell-utils.c:69 ../src/shell/e-shell-utils.c:133
+#: ../src/smime/gui/certificate-manager.c:651
+#: ../src/smime/gui/certificate-manager.c:723
+#: ../src/smime/gui/certificate-manager.c:951
+#: ../src/smime/gui/certificate-manager.c:1332 ../src/smime/gui/e-cert-selector.c:235
 #: ../src/smime/gui/smime-ui.ui.h:17
 msgid "_Cancel"
 msgstr "_Peru"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:15
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3505
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3502
 #: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:3
 #: ../src/addressbook/gui/widgets/eab-contact-merging.c:719
 #: ../src/calendar/calendar.error.xml.h:47 ../src/calendar/gui/e-comp-editor.c:2115
-#: ../src/composer/e-composer-actions.c:230 ../src/composer/e-composer-actions.c:350
-#: ../src/e-util/e-attachment-store.c:833
+#: ../src/composer/e-composer-actions.c:228 ../src/composer/e-composer-actions.c:340
+#: ../src/e-util/e-attachment-store.c:848 ../src/e-util/e-attachment-store.c:855
 #: ../src/e-util/e-mail-signature-script-dialog.c:370
-#: ../src/e-util/e-webdav-browser.c:2467 ../src/e-util/e-web-view.c:4144
+#: ../src/e-util/e-webdav-browser.c:2467 ../src/e-util/e-web-view.c:4318
 #: ../src/e-util/gal-view-instance-save-as-dialog.c:268
-#: ../src/shell/e-shell-content.c:642 ../src/shell/e-shell-utils.c:140
-#: ../src/smime/gui/certificate-manager.c:666
-#: ../src/smime/gui/certificate-manager.c:743
+#: ../src/shell/e-shell-content.c:642 ../src/shell/e-shell-utils.c:133
+#: ../src/smime/gui/certificate-manager.c:651
+#: ../src/smime/gui/certificate-manager.c:724
 msgid "_Save"
 msgstr "_Tallenna"
 
@@ -3698,12 +3808,12 @@ msgstr "_Tallenna"
 #: ../src/calendar/gui/e-comp-editor.c:2012 ../src/calendar/gui/e-comp-editor.c:2084
 #: ../src/e-util/e-preferences-window.c:390 ../src/e-util/e-send-options.ui.h:15
 #: ../src/plugins/email-custom-header/org-gnome-email-custom-header.ui.h:2
-#: ../src/shell/e-shell.c:1458 ../src/shell/e-shell-window-actions.c:971
+#: ../src/shell/e-shell.c:1458 ../src/shell/e-shell-window-actions.c:994
 msgid "_Help"
 msgstr "O_hje"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:17
-#: ../src/e-util/e-misc-utils.c:3493
+#: ../src/e-util/e-misc-utils.c:3559
 msgid "Image"
 msgstr "Kuva"
 
@@ -3761,7 +3871,7 @@ msgid "_Home Page:"
 msgstr "K_otisivu:"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:30
-#: ../src/calendar/gui/e-comp-editor-event.c:731
+#: ../src/calendar/gui/e-comp-editor-event.c:835
 #: ../src/modules/itip-formatter/itip-view.c:2049
 msgid "_Calendar:"
 msgstr "_Kalenteri:"
@@ -3863,7 +3973,9 @@ msgstr "Vuosipäivä"
 msgid "Birthday"
 msgstr "Syntymäpäivä"
 
+#. Other options
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:54
+#: ../src/mail/e-mail-config-defaults-page.c:887
 #: ../src/modules/addressbook/autocompletion-config.c:127
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:46
 msgid "Miscellaneous"
@@ -3915,7 +4027,7 @@ msgstr "Työ"
 #: ../src/addressbook/gui/widgets/eab-contact-formatter.c:84
 #: ../src/addressbook/gui/widgets/eab-contact-formatter.c:525
 #: ../src/addressbook/gui/widgets/eab-contact-formatter.c:927
-#: ../src/calendar/gui/e-cal-model.c:3820
+#: ../src/calendar/gui/e-cal-model.c:3827
 msgid "Other"
 msgstr "Muut"
 
@@ -3939,19 +4051,19 @@ msgstr "Lisää _X.509"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:69
 #: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:11
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1449
-#: ../src/e-util/e-attachment-view.c:356 ../src/e-util/e-filter-rule.c:409
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1521
+#: ../src/e-util/e-attachment-view.c:355 ../src/e-util/e-filter-rule.c:409
 #: ../src/e-util/e-mail-signature-manager.c:368
 #: ../src/e-util/e-name-selector-dialog.c:1037 ../src/e-util/filter.error.xml.h:18
 #: ../src/e-util/filter.ui.h:27 ../src/mail/e-mail-config-identity-page.c:871
 #: ../src/mail/e-mail-label-manager.c:389 ../src/mail/em-filter-rule.c:678
-#: ../src/mail/em-folder-properties.c:1029 ../src/mail/em-vfolder-editor-rule.c:642
-#: ../src/mail/mail-config.ui.h:62
-#: ../src/plugins/attachment-reminder/attachment-reminder.c:553
-#: ../src/plugins/email-custom-header/email-custom-header.c:847
+#: ../src/mail/em-folder-properties.c:1050 ../src/mail/em-vfolder-editor-rule.c:642
+#: ../src/mail/mail-config.ui.h:64
+#: ../src/plugins/attachment-reminder/attachment-reminder.c:554
+#: ../src/plugins/email-custom-header/email-custom-header.c:848
 #: ../src/plugins/publish-calendar/publish-calendar.c:790
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:35
-#: ../src/plugins/templates/templates.c:472
+#: ../src/plugins/templates/templates.c:474
 msgid "_Remove"
 msgstr "_Poista"
 
@@ -3968,119 +4080,122 @@ msgstr "_Lataa X.509"
 msgid "Certificates"
 msgstr "Varmenteet"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:260
-#: ../src/calendar/gui/e-comp-editor.c:2047 ../src/e-util/e-html-editor-actions.c:913
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:261
+#: ../src/calendar/gui/e-comp-editor.c:2047 ../src/e-util/e-html-editor-actions.c:945
 msgid "_Undo"
 msgstr "_Kumoa"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:262
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:263
 #: ../src/calendar/gui/e-comp-editor.c:2049 ../src/e-util/e-focus-tracker.c:120
 msgid "Undo"
 msgstr "Kumoa"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:267
-#: ../src/calendar/gui/e-comp-editor.c:2054 ../src/e-util/e-html-editor-actions.c:899
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:268
+#: ../src/calendar/gui/e-comp-editor.c:2054 ../src/e-util/e-html-editor-actions.c:931
 msgid "_Redo"
 msgstr "_Tee uudelleen"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:269
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:270
 #: ../src/calendar/gui/e-comp-editor.c:2056 ../src/e-util/e-focus-tracker.c:136
 msgid "Redo"
 msgstr "Tee uudelleen"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:301
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:302
 #: ../src/addressbook/gui/widgets/eab-gui-util.c:501
 msgid "Error adding contact"
 msgstr "Virhe lisättäessä yhteystietoa"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:321
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:322
 msgid "Error modifying contact"
 msgstr "Virhe muokattaessa yhteystietoa"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:341
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:342
 msgid "Error removing contact"
 msgstr "Virhe poistettaessa yhteystietoa"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:741
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3102
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:742
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3103
 #, c-format
 msgid "Contact Editor — %s"
 msgstr "Yhteystietojen muokkain — %s"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3238
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3239
 msgid "X.509 certificates"
 msgstr "X.509-varmenteet"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3243
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3244
 msgid "PGP keys"
 msgstr "PGP-avaimet"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3249
-#: ../src/smime/gui/certificate-manager.c:689
-#: ../src/smime/gui/certificate-manager.c:978
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3250
+#: ../src/smime/gui/certificate-manager.c:672
+#: ../src/smime/gui/certificate-manager.c:961
 msgid "All files"
 msgstr "Kaikki tiedostot"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3269
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3270
 msgid "Open PGP key"
 msgstr "Avaa PGP-avain"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3269
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3270
 msgid "Open X.509 certificate"
 msgstr "Avaa X.509-varmenne"
 
 #: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3272
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4322
-#: ../src/e-util/e-attachment-store.c:662 ../src/e-util/e-category-editor.c:148
-#: ../src/e-util/e-html-editor-actions.c:322
-#: ../src/e-util/e-html-editor-actions.c:416
-#: ../src/e-util/e-image-chooser-dialog.c:172 ../src/plugins/face/face.c:296
-#: ../src/shell/e-shell-utils.c:71 ../src/smime/gui/certificate-manager.c:967
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4334
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4341
+#: ../src/e-util/e-attachment-store.c:666 ../src/e-util/e-category-editor.c:179
+#: ../src/e-util/e-html-editor-actions.c:304
+#: ../src/e-util/e-html-editor-actions.c:348
+#: ../src/e-util/e-html-editor-actions.c:430
+#: ../src/e-util/e-image-chooser-dialog.c:182 ../src/plugins/face/face.c:298
+#: ../src/shell/e-shell-utils.c:69 ../src/smime/gui/certificate-manager.c:951
 msgid "_Open"
 msgstr "_Avaa"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3289
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3520
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3287
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3515
 msgid "Chosen file is not a local file."
 msgstr "Valittu tiedosto ei ole paikallinen tiedosto."
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3302
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3300
 #, c-format
 msgid "Failed to load certificate: %s"
 msgstr "Varmenteen lataaminen epäonnistui: %s"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3331
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3329
 msgctxt "cert-kind"
 msgid "X.509"
 msgstr "X.509"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3331
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3329
 msgctxt "cert-kind"
 msgid "PGP"
 msgstr "PGP"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3502
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3500
 msgid "Save PGP key"
 msgstr "Tallenna PGP-avain"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3502
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3500
 msgid "Save X.509 certificate"
 msgstr "Tallenna X.509-varmenne"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3532
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3527
 #, c-format
 msgid "Failed to save certificate: %s"
 msgstr "Varmenteen tallentaminen epäonnistui: %s"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4318
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4331
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4337
 msgid "Please select an image for this contact"
 msgstr "Valitse kuva tälle henkilölle"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4323
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4342
 msgid "_No image"
 msgstr "_Ei kuvaa"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4672
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4702
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -4088,28 +4203,28 @@ msgstr ""
 "Yhteystieto on virheellinen:\n"
 "\n"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4678
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4708
 #, c-format
 msgid "“%s” has an invalid format"
 msgstr "“%s” sisältää virheellisen muotoilun"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4686
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4716
 #, c-format
 msgid "“%s” cannot be a future date"
 msgstr "“%s” ei voi olla tuleva päivä"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4694
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4724
 #, c-format
 msgid "%s“%s” has an invalid format"
 msgstr "%s“%s” sisältää virheellisen muotoilun"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4707
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4721
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4737
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4751
 #, c-format
 msgid "%s“%s” is empty"
 msgstr "%s“%s” on tyhjä"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4736
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4766
 msgid "Invalid contact."
 msgstr "Virheellinen yhteystieto."
 
@@ -4119,8 +4234,8 @@ msgstr "Virheellinen yhteystieto."
 #: ../src/addressbook/gui/widgets/eab-gui-util.c:317
 #: ../src/calendar/gui/e-comp-editor-page-recurrence.c:302
 #: ../src/e-util/e-attachment-dialog.c:311 ../src/e-util/e-categories-dialog.c:81
-#: ../src/e-util/e-category-editor.c:212 ../src/e-util/e-charset-combo-box.c:100
-#: ../src/e-util/e-color-chooser-widget.c:126 ../src/e-util/e-filter-datespec.c:290
+#: ../src/e-util/e-category-editor.c:260 ../src/e-util/e-charset-combo-box.c:100
+#: ../src/e-util/e-color-chooser-widget.c:126 ../src/e-util/e-filter-datespec.c:301
 #: ../src/e-util/e-html-editor-link-dialog.c:255 ../src/e-util/e-passwords.c:469
 #: ../src/e-util/e-rule-context.c:817 ../src/e-util/e-rule-editor.c:188
 #: ../src/e-util/e-rule-editor.c:299 ../src/e-util/e-rule-editor.c:934
@@ -4135,7 +4250,7 @@ msgstr "Virheellinen yhteystieto."
 #: ../src/plugins/email-custom-header/org-gnome-email-custom-header.ui.h:4
 #: ../src/plugins/publish-calendar/url-editor-dialog.c:420
 #: ../src/shell/e-shell-content.c:643 ../src/shell/e-shell-content.c:749
-#: ../src/shell/main.c:177 ../src/smime/gui/certificate-manager.c:1349
+#: ../src/shell/main.c:177 ../src/smime/gui/certificate-manager.c:1333
 #: ../src/smime/gui/e-cert-selector.c:236 ../src/smime/gui/smime-ui.ui.h:18
 msgid "_OK"
 msgstr "_OK"
@@ -4338,22 +4453,22 @@ msgid "Copy _Email Address"
 msgstr "Kopioi _sähköpostiosoite"
 
 #: ../src/addressbook/gui/widgets/eab-contact-display.c:187
-#: ../src/e-util/e-web-view.c:370
+#: ../src/e-util/e-web-view.c:428
 msgid "Copy the email address to the clipboard"
 msgstr "Kopioi sähköpostiosoite leikepöydälle"
 
 #: ../src/addressbook/gui/widgets/eab-contact-display.c:192
-#: ../src/e-util/e-web-view.c:382
+#: ../src/e-util/e-web-view.c:440
 msgid "_Send New Message To..."
 msgstr "Lähetä uusi _viesti..."
 
 #: ../src/addressbook/gui/widgets/eab-contact-display.c:194
-#: ../src/e-util/e-web-view.c:384
+#: ../src/e-util/e-web-view.c:442
 msgid "Send a mail message to this address"
 msgstr "Lähetä sähköpostiviesti tähän osoitteeseen"
 
 #: ../src/addressbook/gui/widgets/eab-contact-display.c:321
-#: ../src/e-util/e-web-view.c:1376
+#: ../src/e-util/e-web-view.c:1441
 #, c-format
 msgid "Click to mail %s"
 msgstr "Napsauta lähettääksesi %s"
@@ -4519,10 +4634,10 @@ msgstr "Blogi"
 #: ../src/addressbook/gui/widgets/eab-contact-merging.c:259
 #: ../src/calendar/gui/e-cal-component-preview.c:322
 #: ../src/calendar/gui/e-cal-model-tasks.c:272
-#: ../src/calendar/gui/e-cal-model-tasks.c:514 ../src/calendar/gui/e-task-table.c:210
+#: ../src/calendar/gui/e-cal-model-tasks.c:526 ../src/calendar/gui/e-task-table.c:210
 #: ../src/calendar/gui/e-task-table.c:225 ../src/calendar/gui/e-task-table.c:635
-#: ../src/calendar/gui/print.c:3591 ../src/calendar/gui/tasktypes.xml.in.h:14
-#: ../src/mail/mail-send-recv.c:1062
+#: ../src/calendar/gui/print.c:3600 ../src/calendar/gui/tasktypes.xml.in.h:14
+#: ../src/mail/mail-send-recv.c:1146
 msgid "Cancelled"
 msgstr "Peruttu"
 
@@ -4753,16 +4868,16 @@ msgid "Are you sure you want to delete this contact (%s)?"
 msgstr "Haluatko varmasti poistaa tämän yhteystiedon (%s)?"
 
 #: ../src/addressbook/gui/widgets/e-addressbook-view.c:1361
-#: ../src/calendar/gui/e-comp-editor.c:2005 ../src/e-util/e-accounts-window.c:1750
+#: ../src/calendar/gui/e-comp-editor.c:2005 ../src/e-util/e-accounts-window.c:1753
 #: ../src/e-util/e-focus-tracker.c:783 ../src/e-util/evolution-source-viewer.c:806
 #: ../src/e-util/e-webdav-browser.c:2688 ../src/mail/e-mail-account-manager.c:737
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1173
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:1547
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:699
 #: ../src/modules/calendar/e-task-shell-view-actions.c:853
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1503
-#: ../src/shell/e-shell-window-actions.c:836
-#: ../src/smime/gui/certificate-manager.c:1672 ../src/smime/gui/smime-ui.ui.h:8
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1589
+#: ../src/shell/e-shell-window-actions.c:859
+#: ../src/smime/gui/certificate-manager.c:1656 ../src/smime/gui/smime-ui.ui.h:8
 msgid "_Delete"
 msgstr "_Poista"
 
@@ -4897,7 +5012,7 @@ msgid "Title"
 msgstr "Titteli"
 
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:38
-#: ../src/calendar/gui/e-meeting-list-view.c:658
+#: ../src/calendar/gui/e-meeting-list-view.c:671
 #: ../src/calendar/gui/e-meeting-time-sel.etspec.h:5
 msgid "Role"
 msgstr "Rooli"
@@ -4960,15 +5075,15 @@ msgstr "Lä_hennä"
 
 #. Zoom-out button
 #: ../src/addressbook/gui/widgets/e-contact-map-window.c:417
-#: ../src/mail/e-mail-reader.c:2809
+#: ../src/mail/e-mail-reader.c:2829
 msgid "Zoom _Out"
 msgstr "L_oitonna"
 
 #. Search button
 #: ../src/addressbook/gui/widgets/e-contact-map-window.c:447
-#: ../src/e-util/e-html-editor-actions.c:1872
+#: ../src/e-util/e-html-editor-actions.c:2015
 #: ../src/e-util/e-html-editor-find-dialog.c:250
-#: ../src/shell/e-shell-window-actions.c:906
+#: ../src/shell/e-shell-window-actions.c:929
 msgid "_Find"
 msgstr "_Etsi"
 
@@ -5683,7 +5798,6 @@ msgstr "Tätä tehtävää ei löydy mistään tehtävälistasta"
 
 #. Translators: {0} is the name of the calendar.
 #: ../src/calendar/calendar.error.xml.h:101
-#| msgid "Failed to load the calendar '%s' (%s)"
 msgid "Failed to create an event in the calendar “{0}”"
 msgstr "Tapahtuman luominen kalenteriin “{0}” epäonnistui"
 
@@ -5703,7 +5817,6 @@ msgstr "Tätä tehtävää ei löydy mistään tehtävälistasta"
 
 #. Translators: {0} is the name of the calendar.
 #: ../src/calendar/calendar.error.xml.h:107
-#| msgid "Found the appointment in the calendar '%s'"
 msgid "Failed to modify an event in the calendar “{0}”"
 msgstr "Tapahtuman muokkaaminen kalenterissa “{0}” epäonnistui"
 
@@ -5723,7 +5836,6 @@ msgstr "Tätä tehtävää ei löydy mistään tehtävälistasta"
 
 #. Translators: {0} is the name of the calendar.
 #: ../src/calendar/calendar.error.xml.h:113
-#| msgid "Found the appointment in the calendar '%s'"
 msgid "Failed to delete an event in the calendar “{0}”"
 msgstr "Tapahtuman poistaminen kalenterista “{0}” epäonnistui"
 
@@ -5743,7 +5855,6 @@ msgstr "Tätä tehtävää ei löydy mistään tehtävälistasta"
 
 #. Translators: {0} is the name of the calendar.
 #: ../src/calendar/calendar.error.xml.h:119
-#| msgid "Found the appointment in the calendar '%s'"
 msgid "Failed to update an event in the calendar “{0}”"
 msgstr "Tapahtuman päivittäminen kalenterissa “{0}” epäonnistui"
 
@@ -5763,7 +5874,6 @@ msgstr "Tätä tehtävää ei löydy mistään tehtävälistasta"
 
 #. Translators: {0} is the name of the calendar.
 #: ../src/calendar/calendar.error.xml.h:125
-#| msgid "Found the appointment in the calendar '%s'"
 msgid "Failed to send an event to the calendar “{0}”"
 msgstr "Tapahtuman lähettäminen kalenteriin “{0}” epäonnistui"
 
@@ -5994,7 +6104,7 @@ msgstr "ei sisällä"
 #: ../src/calendar/gui/e-cal-list-view.etspec.h:4
 #: ../src/calendar/gui/memotypes.xml.in.h:4 ../src/calendar/gui/tasktypes.xml.in.h:4
 #: ../src/e-util/e-attachment-tree-view.c:147
-#: ../src/e-util/e-collection-account-wizard.c:1678
+#: ../src/e-util/e-collection-account-wizard.c:1893
 #: ../src/e-util/e-table-config.ui.h:20
 #: ../src/modules/plugin-manager/evolution-plugin-manager.c:66
 msgid "Description"
@@ -6021,19 +6131,19 @@ msgstr "on"
 msgid "is not"
 msgstr "ei ole"
 
-#: ../src/calendar/gui/caltypes.xml.in.h:9 ../src/calendar/gui/e-cal-list-view.c:238
+#: ../src/calendar/gui/caltypes.xml.in.h:9 ../src/calendar/gui/e-cal-list-view.c:243
 #: ../src/calendar/gui/e-cal-model.c:303 ../src/calendar/gui/e-cal-model.c:310
 #: ../src/calendar/gui/e-task-table.c:523 ../src/calendar/gui/memotypes.xml.in.h:10
 msgid "Public"
 msgstr "Julkinen"
 
-#: ../src/calendar/gui/caltypes.xml.in.h:10 ../src/calendar/gui/e-cal-list-view.c:239
+#: ../src/calendar/gui/caltypes.xml.in.h:10 ../src/calendar/gui/e-cal-list-view.c:244
 #: ../src/calendar/gui/e-cal-model.c:312 ../src/calendar/gui/e-task-table.c:524
 #: ../src/calendar/gui/memotypes.xml.in.h:11
 msgid "Private"
 msgstr "Henkilökohtainen"
 
-#: ../src/calendar/gui/caltypes.xml.in.h:11 ../src/calendar/gui/e-cal-list-view.c:240
+#: ../src/calendar/gui/caltypes.xml.in.h:11 ../src/calendar/gui/e-cal-list-view.c:245
 #: ../src/calendar/gui/e-cal-model.c:314 ../src/calendar/gui/e-task-table.c:525
 #: ../src/calendar/gui/memotypes.xml.in.h:12
 #: ../src/e-util/e-html-editor-page-dialog.c:113 ../src/e-util/e-send-options.ui.h:7
@@ -6053,7 +6163,7 @@ msgstr "Osanottaja"
 
 #: ../src/calendar/gui/caltypes.xml.in.h:14
 #: ../src/calendar/gui/e-cal-list-view.etspec.h:5
-#: ../src/mail/message-list.etspec.h:14
+#: ../src/calendar/gui/e-task-table.etspec.h:13 ../src/mail/message-list.etspec.h:14
 #: ../src/plugins/publish-calendar/publish-calendar.c:861
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:23
 #: ../src/plugins/save-calendar/csv-format.c:387
@@ -6402,8 +6512,11 @@ msgid "Categories:"
 msgstr "Luokat:"
 
 #: ../src/calendar/gui/e-cal-component-preview.c:258
-msgid "Summary:"
-msgstr "Kuvaus:"
+#: ../src/modules/cal-config-weather/evolution-cal-config-weather.c:249
+#: ../src/modules/itip-formatter/itip-view.c:1682
+#: ../src/modules/itip-formatter/itip-view.c:1793
+msgid "Location:"
+msgstr "Sijainti:"
 
 #: ../src/calendar/gui/e-cal-component-preview.c:266
 msgid "Start Date:"
@@ -6431,29 +6544,29 @@ msgstr "Tila:"
 
 #: ../src/calendar/gui/e-cal-component-preview.c:316
 #: ../src/calendar/gui/e-cal-model-tasks.c:268
-#: ../src/calendar/gui/e-cal-model-tasks.c:510
-#: ../src/calendar/gui/e-cal-model-tasks.c:591 ../src/calendar/gui/e-task-table.c:206
+#: ../src/calendar/gui/e-cal-model-tasks.c:522
+#: ../src/calendar/gui/e-cal-model-tasks.c:603 ../src/calendar/gui/e-task-table.c:206
 #: ../src/calendar/gui/e-task-table.c:221 ../src/calendar/gui/e-task-table.c:633
-#: ../src/calendar/gui/print.c:3585
+#: ../src/calendar/gui/print.c:3594
 msgid "In Progress"
 msgstr "Työn alla"
 
 #: ../src/calendar/gui/e-cal-component-preview.c:319
 #: ../src/calendar/gui/e-cal-model-tasks.c:270
-#: ../src/calendar/gui/e-cal-model-tasks.c:512
-#: ../src/calendar/gui/e-meeting-store.c:202
-#: ../src/calendar/gui/e-meeting-store.c:225 ../src/calendar/gui/e-task-table.c:208
+#: ../src/calendar/gui/e-cal-model-tasks.c:524
+#: ../src/calendar/gui/e-meeting-store.c:205
+#: ../src/calendar/gui/e-meeting-store.c:228 ../src/calendar/gui/e-task-table.c:208
 #: ../src/calendar/gui/e-task-table.c:223 ../src/calendar/gui/e-task-table.c:634
-#: ../src/calendar/gui/print.c:3588 ../src/calendar/gui/tasktypes.xml.in.h:13
+#: ../src/calendar/gui/print.c:3597 ../src/calendar/gui/tasktypes.xml.in.h:13
 #: ../src/plugins/save-calendar/csv-format.c:377
 msgid "Completed"
 msgstr "Valmis"
 
 #: ../src/calendar/gui/e-cal-component-preview.c:326
 #: ../src/calendar/gui/e-cal-model-tasks.c:266
-#: ../src/calendar/gui/e-cal-model-tasks.c:508 ../src/calendar/gui/e-task-table.c:204
+#: ../src/calendar/gui/e-cal-model-tasks.c:520 ../src/calendar/gui/e-task-table.c:204
 #: ../src/calendar/gui/e-task-table.c:219 ../src/calendar/gui/e-task-table.c:632
-#: ../src/calendar/gui/print.c:3582 ../src/calendar/gui/tasktypes.xml.in.h:11
+#: ../src/calendar/gui/print.c:3591 ../src/calendar/gui/tasktypes.xml.in.h:11
 msgid "Not Started"
 msgstr "Ei aloitettu"
 
@@ -6468,7 +6581,7 @@ msgid "High"
 msgstr "Korkea"
 
 #: ../src/calendar/gui/e-cal-component-preview.c:343
-#: ../src/calendar/gui/e-cal-model.c:1905 ../src/calendar/gui/e-task-table.c:550
+#: ../src/calendar/gui/e-cal-model.c:1911 ../src/calendar/gui/e-task-table.c:550
 #: ../src/calendar/gui/tasktypes.xml.in.h:20 ../src/e-util/e-send-options.ui.h:5
 #: ../src/mail/message-list.c:327
 msgid "Normal"
@@ -6489,19 +6602,19 @@ msgstr "Kuvaus:"
 msgid "Web Page:"
 msgstr "WWW-sivu:"
 
-#: ../src/calendar/gui/e-cal-data-model.c:1696
+#: ../src/calendar/gui/e-cal-data-model.c:1709
 #, fuzzy, c-format
 #| msgid "Opening calendar '%s'"
 msgid "Creating view for calendar “%s”"
 msgstr "Avataan kalenteria %s"
 
-#: ../src/calendar/gui/e-cal-data-model.c:1700
+#: ../src/calendar/gui/e-cal-data-model.c:1713
 #, fuzzy, c-format
 #| msgid "Opening task list '%s'"
 msgid "Creating view for task list “%s”"
 msgstr "Avataan tehtävälistaa '%s'"
 
-#: ../src/calendar/gui/e-cal-data-model.c:1704
+#: ../src/calendar/gui/e-cal-data-model.c:1717
 #, fuzzy, c-format
 #| msgid "Opening memo list '%s'"
 msgid "Creating view for memo list “%s”"
@@ -6688,7 +6801,7 @@ msgstr "Tallenna iCalendar-muodossa"
 #. * "Organizer: NameOfTheUser <email ofuser com>"
 #. To Translators: It will display
 #. * "Organizer: NameOfTheUser <email ofuser com>"
-#: ../src/calendar/gui/e-calendar-view.c:1854 ../src/calendar/gui/e-memo-table.c:493
+#: ../src/calendar/gui/e-calendar-view.c:1854 ../src/calendar/gui/e-memo-table.c:499
 #: ../src/calendar/gui/e-task-table.c:819
 #, c-format
 msgid "Organizer: %s <%s>"
@@ -6697,24 +6810,25 @@ msgstr "Järjestäjä: %s <%s>"
 #. With SunOne accouts, there may be no ':' in organiser.value
 #. With SunOne accounts, there may be no ':' in
 #. * organizer.value.
-#: ../src/calendar/gui/e-calendar-view.c:1858 ../src/calendar/gui/e-memo-table.c:498
+#: ../src/calendar/gui/e-calendar-view.c:1858 ../src/calendar/gui/e-memo-table.c:504
 #: ../src/calendar/gui/e-task-table.c:823
 #, c-format
 msgid "Organizer: %s"
 msgstr "Järjestäjä: %s"
 
-#. To Translators: It will display "Location: PlaceOfTheMeeting"
+#. Translators: It will display "Location: PlaceOfTheMeeting"
 #. Translators: It will display "Location: LocationOfTheAppointment"
 #: ../src/calendar/gui/e-calendar-view.c:1874
 #: ../src/calendar/gui/e-meeting-time-sel.c:2580
-#: ../src/calendar/gui/e-to-do-pane.c:346 ../src/calendar/gui/print.c:3536
+#: ../src/calendar/gui/e-task-table.c:839 ../src/calendar/gui/e-to-do-pane.c:363
+#: ../src/calendar/gui/print.c:3545
 #, c-format
 msgid "Location: %s"
 msgstr "Sijainti: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
 #. Translators: It will display "Time: StartDateAndTime (Duration)"
-#: ../src/calendar/gui/e-calendar-view.c:1914 ../src/calendar/gui/e-to-do-pane.c:443
+#: ../src/calendar/gui/e-calendar-view.c:1914 ../src/calendar/gui/e-to-do-pane.c:460
 #, c-format
 msgid "Time: %s %s"
 msgstr "Aika: %s %s"
@@ -6731,7 +6845,7 @@ msgstr "%e. %Bta %Y"
 #. strftime format %d = day of month, %b = abbreviated
 #. * month name. You can change the order but don't
 #. * change the specifiers or add anything.
-#: ../src/calendar/gui/e-calendar-view.c:2311 ../src/calendar/gui/e-day-view.c:3104
+#: ../src/calendar/gui/e-calendar-view.c:2311 ../src/calendar/gui/e-day-view.c:3095
 #: ../src/calendar/gui/e-day-view-top-item.c:865
 #: ../src/calendar/gui/e-week-view-main-item.c:228
 msgid "%d %b"
@@ -6747,7 +6861,7 @@ msgstr "%A %e. %Bta %Y"
 #. * %d = day of month, %b = abbreviated month name.
 #. * You can change the order but don't change the
 #. * specifiers or add anything.
-#: ../src/calendar/gui/e-calendar-view.c:2324 ../src/calendar/gui/e-day-view.c:3088
+#: ../src/calendar/gui/e-calendar-view.c:2324 ../src/calendar/gui/e-day-view.c:3079
 #: ../src/calendar/gui/e-day-view-top-item.c:861
 #: ../src/calendar/gui/e-week-view-main-item.c:214
 msgid "%a %d %b"
@@ -6770,20 +6884,20 @@ msgstr "Päättymispäivä"
 
 #: ../src/calendar/gui/e-cal-list-view.etspec.h:7
 #: ../src/calendar/gui/e-memo-table.etspec.h:6
-#: ../src/calendar/gui/e-task-table.etspec.h:13
+#: ../src/calendar/gui/e-task-table.etspec.h:14
 #: ../src/plugins/save-calendar/csv-format.c:378
 msgid "Created"
 msgstr "Luotu"
 
 #: ../src/calendar/gui/e-cal-list-view.etspec.h:8
 #: ../src/calendar/gui/e-memo-table.etspec.h:7
-#: ../src/calendar/gui/e-task-table.etspec.h:14
+#: ../src/calendar/gui/e-task-table.etspec.h:15
 msgid "Last modified"
 msgstr "Viimeksi muokattu"
 
 #: ../src/calendar/gui/e-cal-list-view.etspec.h:9
 #: ../src/calendar/gui/e-memo-table.etspec.h:8
-#: ../src/calendar/gui/e-task-table.etspec.h:15
+#: ../src/calendar/gui/e-task-table.etspec.h:16
 #: ../src/em-format/e-mail-formatter-source.c:118
 msgid "Source"
 msgstr "Lähde"
@@ -6791,12 +6905,12 @@ msgstr "Lähde"
 #: ../src/calendar/gui/e-cal-model.c:316
 #: ../src/calendar/gui/e-meeting-list-view.c:183
 #: ../src/calendar/gui/e-meeting-list-view.c:197
-#: ../src/calendar/gui/e-meeting-store.c:132
-#: ../src/calendar/gui/e-meeting-store.c:167
-#: ../src/calendar/gui/e-meeting-store.c:230 ../src/calendar/gui/print.c:1247
-#: ../src/calendar/gui/print.c:1264 ../src/e-util/e-charset.c:49
+#: ../src/calendar/gui/e-meeting-store.c:135
+#: ../src/calendar/gui/e-meeting-store.c:170
+#: ../src/calendar/gui/e-meeting-store.c:233 ../src/calendar/gui/print.c:1256
+#: ../src/calendar/gui/print.c:1273 ../src/e-util/e-charset.c:49
 #: ../src/modules/itip-formatter/itip-view.c:3560
-#: ../src/modules/itip-formatter/itip-view.c:6332
+#: ../src/modules/itip-formatter/itip-view.c:6382
 #: ../src/modules/plugin-manager/evolution-plugin-manager.c:97
 msgid "Unknown"
 msgstr "Tuntematon"
@@ -6823,70 +6937,70 @@ msgstr "Luodaan muistilappu"
 msgid "Creating a task"
 msgstr "Luodaan tehtävä"
 
-#: ../src/calendar/gui/e-cal-model.c:1907
+#: ../src/calendar/gui/e-cal-model.c:1913
 msgid "Recurring"
 msgstr "Toistuva"
 
-#: ../src/calendar/gui/e-cal-model.c:1909
+#: ../src/calendar/gui/e-cal-model.c:1915
 msgid "Assigned"
 msgstr "Annettu tehtäväksi"
 
-#: ../src/calendar/gui/e-cal-model.c:1911
-#: ../src/calendar/gui/e-cal-model-tasks.c:1094
+#: ../src/calendar/gui/e-cal-model.c:1918
+#: ../src/calendar/gui/e-cal-model-tasks.c:1144
 #: ../src/calendar/gui/e-meeting-list-view.c:207
-#: ../src/calendar/gui/e-meeting-store.c:174
-#: ../src/calendar/gui/e-meeting-store.c:184
-#: ../src/calendar/gui/e-meeting-store.c:1021
+#: ../src/calendar/gui/e-meeting-store.c:177
+#: ../src/calendar/gui/e-meeting-store.c:187
+#: ../src/calendar/gui/e-meeting-store.c:1098
 msgid "Yes"
 msgstr "Kyllä"
 
-#: ../src/calendar/gui/e-cal-model.c:1911
-#: ../src/calendar/gui/e-cal-model-tasks.c:1094
+#: ../src/calendar/gui/e-cal-model.c:1918
+#: ../src/calendar/gui/e-cal-model-tasks.c:1144
 #: ../src/calendar/gui/e-meeting-list-view.c:208
-#: ../src/calendar/gui/e-meeting-store.c:186
+#: ../src/calendar/gui/e-meeting-store.c:189
 msgid "No"
 msgstr "Ei"
 
-#: ../src/calendar/gui/e-cal-model.c:3815
+#: ../src/calendar/gui/e-cal-model.c:3822
 #: ../src/calendar/gui/e-meeting-list-view.c:219
-#: ../src/calendar/gui/e-meeting-store.c:194
-#: ../src/calendar/gui/e-meeting-store.c:217
-#: ../src/modules/itip-formatter/itip-view.c:6320
+#: ../src/calendar/gui/e-meeting-store.c:197
+#: ../src/calendar/gui/e-meeting-store.c:220
+#: ../src/modules/itip-formatter/itip-view.c:6370
 msgid "Accepted"
 msgstr "Hyväksytty"
 
-#: ../src/calendar/gui/e-cal-model.c:3816
+#: ../src/calendar/gui/e-cal-model.c:3823
 #: ../src/calendar/gui/e-meeting-list-view.c:220
-#: ../src/calendar/gui/e-meeting-store.c:196
-#: ../src/calendar/gui/e-meeting-store.c:219
-#: ../src/modules/itip-formatter/itip-view.c:6326
+#: ../src/calendar/gui/e-meeting-store.c:199
+#: ../src/calendar/gui/e-meeting-store.c:222
+#: ../src/modules/itip-formatter/itip-view.c:6376
 msgid "Declined"
 msgstr "Hylätty"
 
-#: ../src/calendar/gui/e-cal-model.c:3817
+#: ../src/calendar/gui/e-cal-model.c:3824
 #: ../src/calendar/gui/e-meeting-list-view.c:221
-#: ../src/calendar/gui/e-meeting-store.c:198
-#: ../src/calendar/gui/e-meeting-store.c:221
+#: ../src/calendar/gui/e-meeting-store.c:201
+#: ../src/calendar/gui/e-meeting-store.c:224
 #: ../src/calendar/gui/e-meeting-time-sel.c:523
 msgid "Tentative"
 msgstr "Alustava"
 
-#: ../src/calendar/gui/e-cal-model.c:3818
+#: ../src/calendar/gui/e-cal-model.c:3825
 #: ../src/calendar/gui/e-meeting-list-view.c:222
-#: ../src/calendar/gui/e-meeting-store.c:200
-#: ../src/calendar/gui/e-meeting-store.c:223
-#: ../src/modules/itip-formatter/itip-view.c:6329
+#: ../src/calendar/gui/e-meeting-store.c:203
+#: ../src/calendar/gui/e-meeting-store.c:226
+#: ../src/modules/itip-formatter/itip-view.c:6379
 msgid "Delegated"
 msgstr "Valtuutettu"
 
-#: ../src/calendar/gui/e-cal-model.c:3819
+#: ../src/calendar/gui/e-cal-model.c:3826
 msgid "Needs action"
 msgstr "Vaatii toimenpiteitä"
 
 #. To Translators: 'Status' here means the state of the attendees, the resulting string will be in a form:
 #. * Status: Accepted: X   Declined: Y   ...
-#: ../src/calendar/gui/e-cal-model.c:3874
-#: ../src/calendar/gui/e-meeting-list-view.c:687
+#: ../src/calendar/gui/e-cal-model.c:3881
+#: ../src/calendar/gui/e-meeting-list-view.c:700
 #: ../src/calendar/gui/e-meeting-time-sel.etspec.h:9
 #: ../src/calendar/gui/e-task-table.etspec.h:11
 #: ../src/calendar/gui/tasktypes.xml.in.h:8 ../src/mail/filtertypes.xml.in.h:36
@@ -6906,7 +7020,7 @@ msgstr "Vapaa"
 msgid "Busy"
 msgstr "Varattu"
 
-#: ../src/calendar/gui/e-cal-model-tasks.c:454
+#: ../src/calendar/gui/e-cal-model-tasks.c:466
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -6917,7 +7031,7 @@ msgstr ""
 "45.436845,125.862501"
 
 #. Translators: "None" for task's status
-#: ../src/calendar/gui/e-cal-model-tasks.c:506
+#: ../src/calendar/gui/e-cal-model-tasks.c:518
 msgctxt "cal-task-status"
 msgid "None"
 msgstr "Ei mitään"
@@ -6936,17 +7050,17 @@ msgstr "Nimi puuttuu."
 msgid "Modifying a task"
 msgstr ""
 
-#: ../src/calendar/gui/e-cal-ops.c:412 ../src/calendar/gui/e-to-do-pane.c:1946
+#: ../src/calendar/gui/e-cal-ops.c:412 ../src/calendar/gui/e-to-do-pane.c:1954
 msgid "Removing an event"
 msgstr "Poistetaan tapahtuma"
 
-#: ../src/calendar/gui/e-cal-ops.c:416 ../src/calendar/gui/e-to-do-pane.c:1950
+#: ../src/calendar/gui/e-cal-ops.c:416 ../src/calendar/gui/e-to-do-pane.c:1958
 #, fuzzy
 #| msgid "Removing attachments"
 msgid "Removing a memo"
 msgstr "Poistetaan liitteitä"
 
-#: ../src/calendar/gui/e-cal-ops.c:420 ../src/calendar/gui/e-to-do-pane.c:1954
+#: ../src/calendar/gui/e-cal-ops.c:420 ../src/calendar/gui/e-to-do-pane.c:1962
 msgid "Removing a task"
 msgstr "Poistetaan tehtävä"
 
@@ -7155,154 +7269,154 @@ msgstr "Tapahtumaa ei voi muokata, koska valittu kalenteri on vain lukutilassa"
 msgid "Event cannot be fully edited, because you are not the organizer"
 msgstr "Tapahtumaa ei voi muokata täysin, koska et ole sen järjestäjä"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:442
-#: ../src/calendar/gui/e-comp-editor-task.c:541
+#: ../src/calendar/gui/e-comp-editor-event.c:460
+#: ../src/calendar/gui/e-comp-editor-task.c:546
 msgid "Start date is not a valid date"
 msgstr "Aloituspäiväys on virheellinen"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:444
+#: ../src/calendar/gui/e-comp-editor-event.c:462
 msgid "Start time is not a valid time"
 msgstr "Alkamisaika on virheellinen"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:448
-#: ../src/calendar/gui/e-comp-editor-event.c:464
+#: ../src/calendar/gui/e-comp-editor-event.c:466
+#: ../src/calendar/gui/e-comp-editor-event.c:482
 #: ../src/calendar/gui/e-comp-editor-page-attachments.c:206
 #: ../src/calendar/gui/e-comp-editor.c:337
-#: ../src/em-format/e-mail-part-secure-button.c:93 ../src/e-util/e-misc-utils.c:4136
-#: ../src/e-util/e-misc-utils.c:4148 ../src/e-util/e-misc-utils.c:4162
-#: ../src/mail/e-mail-autoconfig.c:976 ../src/mail/e-mail-display.c:2256
-#: ../src/mail/e-mail-reader-utils.c:805 ../src/mail/em-composer-utils.c:3754
-#: ../src/mail/em-composer-utils.c:3785 ../src/mail/mail-send-recv.c:568
-#: ../src/mail/mail-send-recv.c:1398
+#: ../src/em-format/e-mail-part-secure-button.c:93 ../src/e-util/e-misc-utils.c:4202
+#: ../src/e-util/e-misc-utils.c:4214 ../src/e-util/e-misc-utils.c:4228
+#: ../src/mail/e-mail-autoconfig.c:998 ../src/mail/e-mail-display.c:2292
+#: ../src/mail/e-mail-reader-utils.c:805 ../src/mail/em-composer-utils.c:3969
+#: ../src/mail/em-composer-utils.c:4000 ../src/mail/mail-send-recv.c:598
+#: ../src/mail/mail-send-recv.c:1496
 #: ../src/modules/accounts-window/e-accounts-window-editors.c:172
-#: ../src/plugins/face/face.c:174 ../src/shell/e-shell.c:1221
+#: ../src/plugins/face/face.c:175 ../src/shell/e-shell.c:1221
 #: ../src/shell/e-shell.c:1245 ../src/smime/gui/certificate-manager.c:357
 #, c-format
 msgid "Unknown error"
 msgstr "Tuntematon virhe"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:458
+#: ../src/calendar/gui/e-comp-editor-event.c:476
 msgid "End date is not a valid date"
 msgstr "Päättymispäivä ei ole kelvollinen päivä"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:460
+#: ../src/calendar/gui/e-comp-editor-event.c:478
 msgid "End time is not a valid time"
 msgstr "Päättymisaika ei ole kelvollinen aika"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:590
+#: ../src/calendar/gui/e-comp-editor-event.c:677
 #: ../src/calendar/gui/e-comp-editor-memo.c:134
-#: ../src/calendar/gui/e-comp-editor-task.c:646
+#: ../src/calendar/gui/e-comp-editor-task.c:651
 msgid "_Categories"
 msgstr "_Luokat"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:592
+#: ../src/calendar/gui/e-comp-editor-event.c:679
 #: ../src/calendar/gui/e-comp-editor-memo.c:136
-#: ../src/calendar/gui/e-comp-editor-task.c:648
+#: ../src/calendar/gui/e-comp-editor-task.c:653
 msgid "Toggles whether to display categories"
 msgstr "Määrittää näytetäänkö luokat"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:598
-#: ../src/calendar/gui/e-comp-editor-task.c:654
+#: ../src/calendar/gui/e-comp-editor-event.c:685
+#: ../src/calendar/gui/e-comp-editor-task.c:659
 msgid "Time _Zone"
 msgstr "_Aikavyöhyke"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:600
-#: ../src/calendar/gui/e-comp-editor-task.c:656
+#: ../src/calendar/gui/e-comp-editor-event.c:687
+#: ../src/calendar/gui/e-comp-editor-task.c:661
 msgid "Toggles whether the time zone is displayed"
 msgstr "Määrittää näytetäänkö aikavyöhykekenttä"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:606
+#: ../src/calendar/gui/e-comp-editor-event.c:693
 msgid "All _Day Event"
 msgstr "Koko _päivän tapahtuma"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:608
+#: ../src/calendar/gui/e-comp-editor-event.c:695
 msgid "Toggles whether to have All Day Event"
 msgstr "Määrittää onko tämä koko päivän tapahtuma"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:614
+#: ../src/calendar/gui/e-comp-editor-event.c:701
 msgid "Show Time as _Busy"
 msgstr "Näytä aika _varattuna"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:616
+#: ../src/calendar/gui/e-comp-editor-event.c:703
 msgid "Toggles whether to show time as busy"
 msgstr "Määrittää näytetäänkö aika varattuna"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:625
+#: ../src/calendar/gui/e-comp-editor-event.c:712
 msgid "Pu_blic"
 msgstr "J_ulkinen"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:627
+#: ../src/calendar/gui/e-comp-editor-event.c:714
 msgid "Classify as public"
 msgstr "Luokittele julkiseksi"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:632
+#: ../src/calendar/gui/e-comp-editor-event.c:719
 msgid "_Private"
 msgstr "_Yksityinen"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:634
+#: ../src/calendar/gui/e-comp-editor-event.c:721
 msgid "Classify as private"
 msgstr "Luokittele yksityiseksi"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:639
+#: ../src/calendar/gui/e-comp-editor-event.c:726
 msgid "_Confidential"
 msgstr "_Luottamuksellinen"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:641
+#: ../src/calendar/gui/e-comp-editor-event.c:728
 msgid "Classify as confidential"
 msgstr "Luokittele luottamukselliseksi"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:742
+#: ../src/calendar/gui/e-comp-editor-event.c:846
 msgctxt "ECompEditor"
 msgid "_Start time:"
 msgstr "_Alkamisaika:"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:747
+#: ../src/calendar/gui/e-comp-editor-event.c:851
 msgctxt "ECompEditor"
 msgid "_End time:"
 msgstr "_Loppumisaika:"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:757
+#: ../src/calendar/gui/e-comp-editor-event.c:861
 msgctxt "ECompEditor"
 msgid "All da_y event"
 msgstr "Koko _päivän tapahtuma"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:811
+#: ../src/calendar/gui/e-comp-editor-event.c:919
 #: ../src/calendar/gui/e-comp-editor-memo.c:222
-#: ../src/calendar/gui/e-comp-editor-task.c:821
+#: ../src/calendar/gui/e-comp-editor-task.c:829
 msgctxt "ECompEditorPage"
 msgid "General"
 msgstr "Yleiset"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:814
-#: ../src/calendar/gui/e-comp-editor-task.c:838
+#: ../src/calendar/gui/e-comp-editor-event.c:922
+#: ../src/calendar/gui/e-comp-editor-task.c:852
 msgctxt "ECompEditorPage"
 msgid "Reminders"
 msgstr "Muistutukset"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:817
-#: ../src/calendar/gui/e-comp-editor-task.c:842
+#: ../src/calendar/gui/e-comp-editor-event.c:925
+#: ../src/calendar/gui/e-comp-editor-task.c:856
 msgctxt "ECompEditorPage"
 msgid "Recurrence"
 msgstr "Toistuvuus"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:820
+#: ../src/calendar/gui/e-comp-editor-event.c:928
 #: ../src/calendar/gui/e-comp-editor-memo.c:225
-#: ../src/calendar/gui/e-comp-editor-task.c:846
+#: ../src/calendar/gui/e-comp-editor-task.c:860
 msgctxt "ECompEditorPage"
 msgid "Attachments"
 msgstr "Liitteet"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:830
+#: ../src/calendar/gui/e-comp-editor-event.c:938
 msgctxt "ECompEditorPage"
 msgid "Schedule"
 msgstr ""
 
-#: ../src/calendar/gui/e-comp-editor-event.c:862
+#: ../src/calendar/gui/e-comp-editor-event.c:973
 #, c-format
 msgid "Meeting — %s"
 msgstr "Kokous — %s"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:863
+#: ../src/calendar/gui/e-comp-editor-event.c:974
 #, c-format
 msgid "Appointment — %s"
 msgstr "Tapaaminen — %s"
@@ -7324,12 +7438,12 @@ msgid "Memo cannot be fully edited, because you are not the organizer"
 msgstr "Muistilappua ei voi muokata täysin, koska et ole sen järjestäjä"
 
 #: ../src/calendar/gui/e-comp-editor-memo.c:196
-#: ../src/calendar/gui/e-comp-editor-task.c:755
+#: ../src/calendar/gui/e-comp-editor-task.c:760
 msgid "_List:"
 msgstr "_Luettelo:"
 
 #: ../src/calendar/gui/e-comp-editor-memo.c:203
-#: ../src/calendar/gui/e-comp-editor-task.c:762
+#: ../src/calendar/gui/e-comp-editor-task.c:770
 msgctxt "ECompEditor"
 msgid "Sta_rt date:"
 msgstr "_Alkamispäivä:"
@@ -7392,12 +7506,12 @@ msgid "Attachment “%s” doesn’t have valid URI, remove it from the list, pl
 msgstr ""
 
 #: ../src/calendar/gui/e-comp-editor-page-attachments.c:647
-#: ../src/composer/e-composer-actions.c:322
+#: ../src/composer/e-composer-actions.c:312
 msgid "_Attachment..."
 msgstr "_Liite..."
 
 #: ../src/calendar/gui/e-comp-editor-page-attachments.c:649
-#: ../src/composer/e-composer-actions.c:324 ../src/e-util/e-attachment-view.c:344
+#: ../src/composer/e-composer-actions.c:314 ../src/e-util/e-attachment-view.c:343
 msgid "Attach a file"
 msgstr "Liitä tiedosto viestiin"
 
@@ -7419,19 +7533,19 @@ msgstr "Kuvakenäkymä"
 msgid "List View"
 msgstr "Luettelonäkymä"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:315
+#: ../src/calendar/gui/e-comp-editor-page-general.c:387
 #, fuzzy, c-format
 #| msgid "Cannot find matching event in the next %d year"
 #| msgid_plural "Cannot find matching event in the next %d years"
 msgid "Cannot find attendee “%s” in the list of attendees"
 msgstr "Vastaavaa tapahtumaa ei löydy %d vuoden aikana"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:322
+#: ../src/calendar/gui/e-comp-editor-page-general.c:394
 #, c-format
 msgid "Not enough rights to delete attendee “%s”"
 msgstr ""
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:352
+#: ../src/calendar/gui/e-comp-editor-page-general.c:424
 #, fuzzy
 #| msgid "Failed to delete contact"
 msgid "Failed to delete selected attendee"
@@ -7439,97 +7553,97 @@ msgid_plural "Failed to delete selected attendees"
 msgstr[0] "Yhteystiedon poisto epäonnistui"
 msgstr[1] "Yhteystiedon poisto epäonnistui"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:438
+#: ../src/calendar/gui/e-comp-editor-page-general.c:510
 #, fuzzy
 #| msgid "Email Address is not a valid email"
 msgid "Organizer address is not a valid user mail address"
 msgstr "Sähköpostiosoite ei ole kelvollinen osoite"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:599
+#: ../src/calendar/gui/e-comp-editor-page-general.c:675
 msgid "A_ttendees"
 msgstr "_Osanottajat"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:601
+#: ../src/calendar/gui/e-comp-editor-page-general.c:677
 #, fuzzy
 #| msgid "Toggles whether the Attendee Type is displayed"
 msgid "Toggles whether the Attendees are displayed"
 msgstr "Määrittää näytetäänkö läsnäolijan tyyppi"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:610
+#: ../src/calendar/gui/e-comp-editor-page-general.c:686
 msgid "R_ole Field"
 msgstr "R_oolikenttä"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:612
+#: ../src/calendar/gui/e-comp-editor-page-general.c:688
 msgid "Toggles whether the Role field is displayed"
 msgstr "Määrittää näytetäänkö roolikenttä"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:618
+#: ../src/calendar/gui/e-comp-editor-page-general.c:694
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:620
+#: ../src/calendar/gui/e-comp-editor-page-general.c:696
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "Määrittää näytetäänkö RSVP-kenttä"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:626
+#: ../src/calendar/gui/e-comp-editor-page-general.c:702
 msgid "_Status Field"
 msgstr "_Tilakenttä"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:628
+#: ../src/calendar/gui/e-comp-editor-page-general.c:704
 msgid "Toggles whether the Status field is displayed"
 msgstr "Määrittää näytetäänkö tilakenttä"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:634
+#: ../src/calendar/gui/e-comp-editor-page-general.c:710
 msgid "_Type Field"
 msgstr "T_yyppikenttä"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:636
+#: ../src/calendar/gui/e-comp-editor-page-general.c:712
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "Määrittää näytetäänkö läsnäolijan tyyppi"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:981
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1058
 msgid "An organizer is required."
 msgstr "Järjestäjä vaaditaan."
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:991
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1122
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1068
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1199
 msgid "At least one attendee is required."
 msgstr "Vähintään yksi läsnäolija vaaditaan."
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1246
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1323
 msgid "Or_ganizer:"
 msgstr "_Järjestäjä:"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1348
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1420
 msgid "Override color of the event. If not set, then color of the calendar is used."
 msgstr ""
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1350
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1422
 msgid "Override color of the memo. If not set, then color of the memo list is used."
 msgstr ""
 
 #. E_SOURCE_EXTENSION_TASK_LIST
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1352
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1424
 msgid "Override color of the task. If not set, then color of the task list is used."
 msgstr ""
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1364
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1436
 msgctxt "ECompEditor"
 msgid "Atte_ndees..."
 msgstr "_Osanottajat..."
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1441
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1513
 #: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2231
-#: ../src/calendar/gui/e-comp-editor.c:2070 ../src/e-util/e-accounts-window.c:1742
-#: ../src/e-util/e-html-editor-actions.c:922
+#: ../src/calendar/gui/e-comp-editor.c:2070 ../src/e-util/e-accounts-window.c:1745
+#: ../src/e-util/e-html-editor-actions.c:954
 #: ../src/e-util/e-mail-signature-manager.c:358 ../src/e-util/e-webdav-browser.c:2681
 #: ../src/e-util/filter.ui.h:26 ../src/mail/e-mail-account-manager.c:728
 #: ../src/mail/e-mail-browser.c:175 ../src/mail/e-mail-label-manager.c:380
-#: ../src/mail/em-folder-properties.c:1026 ../src/mail/mail-config.ui.h:66
-#: ../src/plugins/attachment-reminder/attachment-reminder.c:548
-#: ../src/plugins/email-custom-header/email-custom-header.c:842
+#: ../src/mail/em-folder-properties.c:1047 ../src/mail/mail-config.ui.h:68
+#: ../src/plugins/attachment-reminder/attachment-reminder.c:549
+#: ../src/plugins/email-custom-header/email-custom-header.c:843
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:34
-#: ../src/plugins/templates/templates.c:467 ../src/shell/e-shell-window-actions.c:957
+#: ../src/plugins/templates/templates.c:469 ../src/shell/e-shell-window-actions.c:980
 #: ../src/smime/gui/smime-ui.ui.h:11
 msgid "_Edit"
 msgstr "_Muokkaa"
@@ -7819,13 +7933,13 @@ msgstr "Poikkeukset"
 
 #: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2223
 #: ../src/calendar/gui/e-comp-editor-page-reminders.c:1774
-#: ../src/mail/e-mail-config-identity-page.c:853 ../src/mail/mail-config.ui.h:65
+#: ../src/mail/e-mail-config-identity-page.c:853 ../src/mail/mail-config.ui.h:67
 msgid "A_dd"
 msgstr "_Lisää"
 
 #: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2239
 #: ../src/calendar/gui/e-comp-editor-page-reminders.c:1782
-#: ../src/mail/mail-config.ui.h:67
+#: ../src/mail/mail-config.ui.h:69
 msgid "Re_move"
 msgstr "_Poista"
 
@@ -7850,7 +7964,7 @@ msgid "Set or unset reminders"
 msgstr "Aseta tai poista tähän tapahtumaan liittyviä muistutuksia"
 
 #: ../src/calendar/gui/e-comp-editor-page-reminders.c:1614
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:71
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:72
 msgid "Reminders"
 msgstr "Muistutukset"
 
@@ -8072,94 +8186,94 @@ msgctxt "ECompEditor"
 msgid "D_ue date:"
 msgstr "_Eräpäivä:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1148
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1154
 #, fuzzy
 #| msgid "Date _completed:"
 msgctxt "ECompEditor"
 msgid "Date _completed:"
 msgstr "_Valmistumispäivä:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1164
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1170
 msgctxt "ECompEditor"
 msgid "Public"
 msgstr "Julkinen"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1165
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1171
 msgctxt "ECompEditor"
 msgid "Private"
 msgstr "Yksityinen"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1166
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1172
 msgctxt "ECompEditor"
 msgid "Confidential"
 msgstr "Luottamuksellinen"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1182
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1188
 msgctxt "ECompEditor"
 msgid "C_lassification:"
 msgstr "Lu_okittelu:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1201
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1207
 msgctxt "ECompEditor"
 msgid "Not Started"
 msgstr "Ei aloitettu"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1202
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1208
 msgctxt "ECompEditor"
 msgid "In Progress"
 msgstr "Työn alla"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1203
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1209
 msgctxt "ECompEditor"
 msgid "Completed"
 msgstr "Valmis"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1204
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1210
 msgctxt "ECompEditor"
 msgid "Cancelled"
 msgstr "Peruttu"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1213
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1219
 msgctxt "ECompEditor"
 msgid "_Status:"
 msgstr "_Tila:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1243
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1249
 msgctxt "ECompEditor"
 msgid "Undefined"
 msgstr "Määrittämätön"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1244
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1250
 msgctxt "ECompEditor"
 msgid "High"
 msgstr "Korkea"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1245
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1251
 msgctxt "ECompEditor"
 msgid "Normal"
 msgstr "Normaali"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1246
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1252
 msgctxt "ECompEditor"
 msgid "Low"
 msgstr "Matala"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1255
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1261
 msgctxt "ECompEditor"
 msgid "Priorit_y:"
 msgstr "_Prioriteetti:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1309
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1315
 msgctxt "ECompEditor"
 msgid "Percent complete:"
 msgstr "Prosenttia valmiina:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1390
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1396
 msgctxt "ECompEditor"
 msgid "Time _zone:"
 msgstr "Aika_vyöhyke:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1515
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1521
 #, fuzzy
 #| msgid "Show Time as _Busy"
 msgctxt "ECompEditor"
@@ -8167,81 +8281,81 @@ msgid "Show time as _busy"
 msgstr "Näytä aika _varattuna"
 
 #. Translators: This 'None' is meant for 'Color' in calendar component editor, like 'None color'
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1642
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1648
 #, fuzzy
 #| msgid "None"
 msgctxt "ECompEditor"
 msgid "None"
 msgstr "Määrittelemätön"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:236
+#: ../src/calendar/gui/e-comp-editor-task.c:241
 #, fuzzy
 #| msgid "Task's start date is in the past"
 msgid "Task’s start date is in the past"
 msgstr "Tehtävän aloitusaika on mennyt"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:244
+#: ../src/calendar/gui/e-comp-editor-task.c:249
 #, fuzzy
 #| msgid "Task's due date is in the past"
 msgid "Task’s due date is in the past"
 msgstr "Tehtävän aloitusaika on mennyt"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:480
+#: ../src/calendar/gui/e-comp-editor-task.c:485
 #, fuzzy
 #| msgid "Task cannot be edited, because the selected task list is read only"
 msgid "Task cannot be edited, because the selected task list could not be opened"
 msgstr "Tehtävää ei voi muokata, koska valittu tehtävälista on vain luettavissa"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:482
+#: ../src/calendar/gui/e-comp-editor-task.c:487
 msgid "Task cannot be edited, because the selected task list is read only"
 msgstr "Tehtävää ei voi muokata, koska valittu tehtävälista on vain luettavissa"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:484
+#: ../src/calendar/gui/e-comp-editor-task.c:489
 msgid "Task cannot be fully edited, because you are not the organizer"
 msgstr "Tehtävää ei voi muokata kokonaan, koska et ole tehtävän järjestäjä"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:555
+#: ../src/calendar/gui/e-comp-editor-task.c:560
 msgid "Start date is required for recurring tasks"
 msgstr ""
 
-#: ../src/calendar/gui/e-comp-editor-task.c:567
+#: ../src/calendar/gui/e-comp-editor-task.c:572
 #, fuzzy
 #| msgid "Recurrence date is invalid"
 msgid "Due date is not a valid date"
 msgstr "Toistuvuuden päiväys on virheellinen"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:578
+#: ../src/calendar/gui/e-comp-editor-task.c:583
 #, fuzzy
 #| msgid "Completed date is wrong"
 msgid "Completed date is not a valid date"
 msgstr "Valmistumispäivä on väärin"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:589
+#: ../src/calendar/gui/e-comp-editor-task.c:594
 #, fuzzy
 #| msgid "1 minute in the future"
 #| msgid_plural "%d minutes in the future"
 msgid "Completed date cannot be in the future"
 msgstr "yhden minuutin päässä"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:662
+#: ../src/calendar/gui/e-comp-editor-task.c:667
 #, fuzzy
 #| msgid "All _Day Event"
 msgid "All _Day Task"
 msgstr "Koko _päivän tapahtuma"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:664
+#: ../src/calendar/gui/e-comp-editor-task.c:669
 #, fuzzy
 #| msgid "Toggles whether to have All Day Event"
 msgid "Toggles whether to have All Day Task"
 msgstr "Määrittää onko tämä koko päivän tapahtuma"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:879
+#: ../src/calendar/gui/e-comp-editor-task.c:893
 #, fuzzy, c-format
 #| msgid "Assigned Task - %s"
 msgid "Assigned Task — %s"
 msgstr "Tehtävänanto - %s"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:880
+#: ../src/calendar/gui/e-comp-editor-task.c:894
 #, fuzzy, c-format
 #| msgid "Task - %s"
 msgid "Task — %s"
@@ -8267,18 +8381,18 @@ msgid "No Summary"
 msgstr "Ei yhteenvetoa"
 
 #. == Button box ==
-#: ../src/calendar/gui/e-comp-editor.c:1984 ../src/composer/e-composer-actions.c:329
-#: ../src/e-util/e-accounts-window.c:1775 ../src/e-util/e-html-editor-dialog.c:194
+#: ../src/calendar/gui/e-comp-editor.c:1984 ../src/composer/e-composer-actions.c:319
+#: ../src/e-util/e-accounts-window.c:1778 ../src/e-util/e-html-editor-dialog.c:194
 #: ../src/e-util/e-mail-signature-editor.c:309
 #: ../src/e-util/e-name-selector-dialog.c:548
 #: ../src/e-util/e-preferences-window.c:399
 #: ../src/e-util/e-table-field-chooser-dialog.c:205 ../src/mail/e-mail-browser.c:131
-#: ../src/mail/e-mail-notes.c:952 ../src/mail/em-folder-properties.c:1151
-#: ../src/mail/em-subscription-editor.c:1739
+#: ../src/mail/e-mail-notes.c:964 ../src/mail/em-filter-editor.c:45
+#: ../src/mail/em-folder-properties.c:1172 ../src/mail/em-subscription-editor.c:1739
 #: ../src/modules/plugin-manager/evolution-plugin-manager.c:306
 #: ../src/shell/e-shell-window-actions.c:296
-#: ../src/shell/e-shell-window-actions.c:801
-#: ../src/smime/gui/certificate-manager.c:2212
+#: ../src/shell/e-shell-window-actions.c:824
+#: ../src/smime/gui/certificate-manager.c:2196
 msgid "_Close"
 msgstr "_Sulje"
 
@@ -8288,37 +8402,37 @@ msgstr "Sulje nykyinen ikkuna"
 
 #. copy menu item
 #: ../src/calendar/gui/e-comp-editor.c:1991 ../src/e-util/e-focus-tracker.c:773
-#: ../src/e-util/e-html-editor-actions.c:878 ../src/e-util/e-text.c:2075
-#: ../src/e-util/e-web-view.c:409 ../src/mail/e-mail-browser.c:138
-#: ../src/mail/mail.error.xml.h:146 ../src/shell/e-shell-window-actions.c:822
+#: ../src/e-util/e-html-editor-actions.c:910 ../src/e-util/e-text.c:2080
+#: ../src/e-util/e-web-view.c:467 ../src/mail/e-mail-browser.c:138
+#: ../src/mail/mail.error.xml.h:147 ../src/shell/e-shell-window-actions.c:845
 msgid "_Copy"
 msgstr "_Kopioi"
 
 #: ../src/calendar/gui/e-comp-editor.c:1993 ../src/e-util/e-focus-tracker.c:173
 #: ../src/e-util/e-focus-tracker.c:229 ../src/e-util/e-focus-tracker.c:282
-#: ../src/e-util/e-focus-tracker.c:774 ../src/e-util/e-web-view.c:411
-#: ../src/e-util/e-web-view.c:2010 ../src/mail/e-mail-browser.c:140
-#: ../src/shell/e-shell-window-actions.c:824
+#: ../src/e-util/e-focus-tracker.c:774 ../src/e-util/e-web-view.c:469
+#: ../src/e-util/e-web-view.c:2075 ../src/mail/e-mail-browser.c:140
+#: ../src/shell/e-shell-window-actions.c:847
 msgid "Copy the selection"
 msgstr "Kopioi valinta"
 
 #. cut menu item
 #: ../src/calendar/gui/e-comp-editor.c:1998 ../src/e-util/e-focus-tracker.c:768
-#: ../src/e-util/e-html-editor-actions.c:885 ../src/e-util/e-text.c:2061
-#: ../src/mail/e-mail-browser.c:145 ../src/shell/e-shell-window-actions.c:829
+#: ../src/e-util/e-html-editor-actions.c:917 ../src/e-util/e-text.c:2066
+#: ../src/mail/e-mail-browser.c:145 ../src/shell/e-shell-window-actions.c:852
 msgid "Cu_t"
 msgstr "_Leikkaa"
 
 #: ../src/calendar/gui/e-comp-editor.c:2000 ../src/e-util/e-focus-tracker.c:166
 #: ../src/e-util/e-focus-tracker.c:222 ../src/e-util/e-focus-tracker.c:276
-#: ../src/e-util/e-focus-tracker.c:769 ../src/e-util/e-web-view.c:2019
-#: ../src/mail/e-mail-browser.c:147 ../src/shell/e-shell-window-actions.c:831
+#: ../src/e-util/e-focus-tracker.c:769 ../src/e-util/e-web-view.c:2084
+#: ../src/mail/e-mail-browser.c:147 ../src/shell/e-shell-window-actions.c:854
 msgid "Cut the selection"
 msgstr "Leikkaa valinta"
 
 #: ../src/calendar/gui/e-comp-editor.c:2007 ../src/e-util/e-focus-tracker.c:187
 #: ../src/e-util/e-focus-tracker.c:243 ../src/e-util/e-focus-tracker.c:784
-#: ../src/shell/e-shell-window-actions.c:838
+#: ../src/shell/e-shell-window-actions.c:861
 msgid "Delete the selection"
 msgstr "Poista valinta"
 
@@ -8328,26 +8442,26 @@ msgstr "Näytä ohje"
 
 #. paste menu item
 #: ../src/calendar/gui/e-comp-editor.c:2019 ../src/e-util/e-focus-tracker.c:778
-#: ../src/e-util/e-html-editor-actions.c:892 ../src/e-util/e-text.c:2087
-#: ../src/mail/e-mail-browser.c:152 ../src/shell/e-shell-window-actions.c:857
+#: ../src/e-util/e-html-editor-actions.c:924 ../src/e-util/e-text.c:2092
+#: ../src/mail/e-mail-browser.c:152 ../src/shell/e-shell-window-actions.c:880
 msgid "_Paste"
 msgstr "_Liitä"
 
 #: ../src/calendar/gui/e-comp-editor.c:2021 ../src/e-util/e-focus-tracker.c:180
 #: ../src/e-util/e-focus-tracker.c:236 ../src/e-util/e-focus-tracker.c:288
-#: ../src/e-util/e-focus-tracker.c:779 ../src/e-util/e-web-view.c:2028
-#: ../src/mail/e-mail-browser.c:154 ../src/shell/e-shell-window-actions.c:859
+#: ../src/e-util/e-focus-tracker.c:779 ../src/e-util/e-web-view.c:2093
+#: ../src/mail/e-mail-browser.c:154 ../src/shell/e-shell-window-actions.c:882
 msgid "Paste the clipboard"
 msgstr "Liitä leikepöytä"
 
-#: ../src/calendar/gui/e-comp-editor.c:2026 ../src/composer/e-composer-actions.c:383
-#: ../src/mail/e-mail-reader.c:2704
+#: ../src/calendar/gui/e-comp-editor.c:2026 ../src/composer/e-composer-actions.c:373
+#: ../src/mail/e-mail-reader.c:2717
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1319
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1333
 msgid "_Print..."
 msgstr "T_ulosta..."
 
-#: ../src/calendar/gui/e-comp-editor.c:2033 ../src/mail/e-mail-reader.c:2711
+#: ../src/calendar/gui/e-comp-editor.c:2033 ../src/mail/e-mail-reader.c:2724
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1326
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:1771
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:840
@@ -8356,14 +8470,14 @@ msgid "Pre_view..."
 msgstr "E_sikatselu..."
 
 #: ../src/calendar/gui/e-comp-editor.c:2040 ../src/e-util/e-focus-tracker.c:788
-#: ../src/e-util/e-html-editor-actions.c:906 ../src/e-util/e-web-view.c:419
-#: ../src/mail/e-mail-browser.c:159 ../src/shell/e-shell-window-actions.c:927
+#: ../src/e-util/e-html-editor-actions.c:938 ../src/e-util/e-web-view.c:484
+#: ../src/mail/e-mail-browser.c:159 ../src/shell/e-shell-window-actions.c:950
 msgid "Select _All"
 msgstr "Valitse _kaikki"
 
 #: ../src/calendar/gui/e-comp-editor.c:2042 ../src/e-util/e-focus-tracker.c:194
 #: ../src/e-util/e-focus-tracker.c:250 ../src/e-util/e-focus-tracker.c:789
-#: ../src/mail/e-mail-browser.c:161 ../src/shell/e-shell-window-actions.c:929
+#: ../src/mail/e-mail-browser.c:161 ../src/shell/e-shell-window-actions.c:952
 msgid "Select all text"
 msgstr "Valitse kaikki teksti"
 
@@ -8371,23 +8485,24 @@ msgstr "Valitse kaikki teksti"
 msgid "_Classification"
 msgstr "Lu_okittelu"
 
-#: ../src/calendar/gui/e-comp-editor.c:2077 ../src/e-util/e-html-editor-actions.c:929
+#: ../src/calendar/gui/e-comp-editor.c:2077 ../src/e-util/e-html-editor-actions.c:961
 #: ../src/e-util/e-mail-signature-editor.c:323 ../src/mail/e-mail-browser.c:168
-#: ../src/mail/e-mail-notes.c:966 ../src/shell/e-shell-window-actions.c:964
+#: ../src/mail/e-mail-notes.c:978 ../src/shell/e-shell-window-actions.c:987
 msgid "_File"
 msgstr "_Tiedosto"
 
-#: ../src/calendar/gui/e-comp-editor.c:2091 ../src/e-util/e-html-editor-actions.c:950
+#: ../src/calendar/gui/e-comp-editor.c:2091 ../src/e-util/e-html-editor-actions.c:982
 msgid "_Insert"
 msgstr "L_isää"
 
-#: ../src/calendar/gui/e-comp-editor.c:2098 ../src/composer/e-composer-actions.c:373
+#: ../src/calendar/gui/e-comp-editor.c:2098 ../src/composer/e-composer-actions.c:363
 msgid "_Options"
 msgstr "_Asetukset"
 
-#: ../src/calendar/gui/e-comp-editor.c:2105 ../src/e-util/e-html-editor-actions.c:971
-#: ../src/mail/e-mail-browser.c:182 ../src/shell/e-shell-window-actions.c:1007
-#: ../src/smime/gui/certificate-manager.c:1662 ../src/smime/gui/smime-ui.ui.h:3
+#: ../src/calendar/gui/e-comp-editor.c:2105
+#: ../src/e-util/e-html-editor-actions.c:1003 ../src/mail/e-mail-browser.c:182
+#: ../src/shell/e-shell-window-actions.c:1030
+#: ../src/smime/gui/certificate-manager.c:1646 ../src/smime/gui/smime-ui.ui.h:3
 msgid "_View"
 msgstr "_Näytä"
 
@@ -8396,7 +8511,7 @@ msgid "Save current changes"
 msgstr "Tallenna nykyiset muutokset"
 
 #: ../src/calendar/gui/e-comp-editor.c:2122
-#: ../src/e-util/e-mail-signature-editor.c:318 ../src/mail/e-mail-notes.c:961
+#: ../src/e-util/e-mail-signature-editor.c:318 ../src/mail/e-mail-notes.c:973
 msgid "Save and Close"
 msgstr "Tallenna ja sulje"
 
@@ -8405,18 +8520,18 @@ msgid "Save current changes and close editor"
 msgstr "Tallenna nykyiset muutokset ja sulje muokkain"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../src/calendar/gui/e-day-view.c:2156 ../src/calendar/gui/e-to-do-pane.c:241
-#: ../src/calendar/gui/e-week-view.c:1781 ../src/calendar/gui/print.c:1070
-#: ../src/calendar/gui/print.c:1089 ../src/calendar/gui/print.c:2626
-#: ../src/calendar/gui/print.c:2646
+#: ../src/calendar/gui/e-day-view.c:2147 ../src/calendar/gui/e-to-do-pane.c:241
+#: ../src/calendar/gui/e-week-view.c:1772 ../src/calendar/gui/print.c:1079
+#: ../src/calendar/gui/print.c:1098 ../src/calendar/gui/print.c:2635
+#: ../src/calendar/gui/print.c:2655
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../src/calendar/gui/e-day-view.c:2159 ../src/calendar/gui/e-to-do-pane.c:245
-#: ../src/calendar/gui/e-week-view.c:1784 ../src/calendar/gui/print.c:1075
-#: ../src/calendar/gui/print.c:1091 ../src/calendar/gui/print.c:2631
-#: ../src/calendar/gui/print.c:2648
+#: ../src/calendar/gui/e-day-view.c:2150 ../src/calendar/gui/e-to-do-pane.c:245
+#: ../src/calendar/gui/e-week-view.c:1775 ../src/calendar/gui/print.c:1084
+#: ../src/calendar/gui/print.c:1100 ../src/calendar/gui/print.c:2640
+#: ../src/calendar/gui/print.c:2657
 msgid "pm"
 msgstr "pm"
 
@@ -8426,14 +8541,14 @@ msgstr "pm"
 #. * month, %B = full month name. You can change the
 #. * order but don't change the specifiers or add
 #. * anything.
-#: ../src/calendar/gui/e-day-view.c:3071
+#: ../src/calendar/gui/e-day-view.c:3062
 #: ../src/calendar/gui/e-day-view-top-item.c:857
-#: ../src/calendar/gui/e-week-view-main-item.c:205 ../src/calendar/gui/print.c:2093
+#: ../src/calendar/gui/e-week-view-main-item.c:205 ../src/calendar/gui/print.c:2102
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. To Translators: the %d stands for a week number, it's value between 1 and 52/53
-#: ../src/calendar/gui/e-day-view.c:3792
+#: ../src/calendar/gui/e-day-view.c:3790
 #, c-format
 msgid "Week %d"
 msgstr "Viikko %d"
@@ -8489,100 +8604,100 @@ msgid "Attendees"
 msgstr "Osanottajat"
 
 #: ../src/calendar/gui/e-meeting-list-view.c:179
-#: ../src/calendar/gui/e-meeting-store.c:107
-#: ../src/calendar/gui/e-meeting-store.c:124
-#: ../src/calendar/gui/e-meeting-store.c:1015 ../src/calendar/gui/print.c:1243
+#: ../src/calendar/gui/e-meeting-store.c:110
+#: ../src/calendar/gui/e-meeting-store.c:127
+#: ../src/calendar/gui/e-meeting-store.c:1092 ../src/calendar/gui/print.c:1252
 msgid "Individual"
 msgstr "Henkilö"
 
 #: ../src/calendar/gui/e-meeting-list-view.c:180
-#: ../src/calendar/gui/e-meeting-store.c:109
-#: ../src/calendar/gui/e-meeting-store.c:126 ../src/calendar/gui/print.c:1244
+#: ../src/calendar/gui/e-meeting-store.c:112
+#: ../src/calendar/gui/e-meeting-store.c:129 ../src/calendar/gui/print.c:1253
 #: ../src/e-util/e-table-config.ui.h:1
 msgid "Group"
 msgstr "Ryhmä"
 
 #: ../src/calendar/gui/e-meeting-list-view.c:181
-#: ../src/calendar/gui/e-meeting-store.c:111
-#: ../src/calendar/gui/e-meeting-store.c:128 ../src/calendar/gui/print.c:1245
+#: ../src/calendar/gui/e-meeting-store.c:114
+#: ../src/calendar/gui/e-meeting-store.c:131 ../src/calendar/gui/print.c:1254
 msgid "Resource"
 msgstr "Resurssi"
 
 #: ../src/calendar/gui/e-meeting-list-view.c:182
-#: ../src/calendar/gui/e-meeting-store.c:113
-#: ../src/calendar/gui/e-meeting-store.c:130 ../src/calendar/gui/print.c:1246
+#: ../src/calendar/gui/e-meeting-store.c:116
+#: ../src/calendar/gui/e-meeting-store.c:133 ../src/calendar/gui/print.c:1255
 msgid "Room"
 msgstr "Huone"
 
 #: ../src/calendar/gui/e-meeting-list-view.c:193
-#: ../src/calendar/gui/e-meeting-store.c:142
-#: ../src/calendar/gui/e-meeting-store.c:159 ../src/calendar/gui/print.c:1260
+#: ../src/calendar/gui/e-meeting-store.c:145
+#: ../src/calendar/gui/e-meeting-store.c:162 ../src/calendar/gui/print.c:1269
 msgid "Chair"
 msgstr "Puheenjohtaja"
 
 #: ../src/calendar/gui/e-meeting-list-view.c:194
-#: ../src/calendar/gui/e-meeting-store.c:144
-#: ../src/calendar/gui/e-meeting-store.c:161
-#: ../src/calendar/gui/e-meeting-store.c:1018 ../src/calendar/gui/print.c:1261
+#: ../src/calendar/gui/e-meeting-store.c:147
+#: ../src/calendar/gui/e-meeting-store.c:164
+#: ../src/calendar/gui/e-meeting-store.c:1095 ../src/calendar/gui/print.c:1270
 msgid "Required Participant"
 msgstr "Vaadittu läsnäolija"
 
 #: ../src/calendar/gui/e-meeting-list-view.c:195
-#: ../src/calendar/gui/e-meeting-store.c:146
-#: ../src/calendar/gui/e-meeting-store.c:163 ../src/calendar/gui/print.c:1262
+#: ../src/calendar/gui/e-meeting-store.c:149
+#: ../src/calendar/gui/e-meeting-store.c:166 ../src/calendar/gui/print.c:1271
 msgid "Optional Participant"
 msgstr "Vapaaehtoinen läsnäolija"
 
 #: ../src/calendar/gui/e-meeting-list-view.c:196
-#: ../src/calendar/gui/e-meeting-store.c:148
-#: ../src/calendar/gui/e-meeting-store.c:165 ../src/calendar/gui/print.c:1263
+#: ../src/calendar/gui/e-meeting-store.c:151
+#: ../src/calendar/gui/e-meeting-store.c:168 ../src/calendar/gui/print.c:1272
 msgid "Non-Participant"
 msgstr "Ei läsnä"
 
 #: ../src/calendar/gui/e-meeting-list-view.c:218
-#: ../src/calendar/gui/e-meeting-store.c:192
-#: ../src/calendar/gui/e-meeting-store.c:215
-#: ../src/calendar/gui/e-meeting-store.c:1028
+#: ../src/calendar/gui/e-meeting-store.c:195
+#: ../src/calendar/gui/e-meeting-store.c:218
+#: ../src/calendar/gui/e-meeting-store.c:1105
 msgid "Needs Action"
 msgstr "Vaatii toimenpiteitä"
 
-#: ../src/calendar/gui/e-meeting-list-view.c:618
+#: ../src/calendar/gui/e-meeting-list-view.c:631
 msgid "Attendee                          "
 msgstr "Osallistuja                          "
 
-#: ../src/calendar/gui/e-meeting-list-view.c:644
+#: ../src/calendar/gui/e-meeting-list-view.c:657
 #: ../src/calendar/gui/e-meeting-time-sel.etspec.h:4
 #: ../src/calendar/gui/e-memo-table.etspec.h:3
 #: ../src/calendar/gui/e-task-table.etspec.h:3 ../src/e-util/e-accounts-window.c:1443
 #: ../src/e-util/e-attachment-tree-view.c:205
-#: ../src/e-util/e-collection-account-wizard.c:1719
+#: ../src/e-util/e-collection-account-wizard.c:1934
 #: ../src/e-util/e-webdav-browser.c:2381 ../src/mail/e-mail-account-tree-view.c:158
 msgid "Type"
 msgstr "Tyyppi"
 
 #. To translators: RSVP means "please reply"
-#: ../src/calendar/gui/e-meeting-list-view.c:673
+#: ../src/calendar/gui/e-meeting-list-view.c:686
 #: ../src/calendar/gui/e-meeting-time-sel.etspec.h:6
 msgid "RSVP"
 msgstr "Kuittauspyyntö"
 
-#: ../src/calendar/gui/e-meeting-store.c:204
-#: ../src/calendar/gui/e-meeting-store.c:227
+#: ../src/calendar/gui/e-meeting-store.c:207
+#: ../src/calendar/gui/e-meeting-store.c:230
 msgid "In Process"
 msgstr "Työn alla"
 
-#: ../src/calendar/gui/e-meeting-store.c:1899
+#: ../src/calendar/gui/e-meeting-store.c:1976
 #, fuzzy, c-format
 msgid "Enter password to access free/busy information on server %s as user %s"
 msgstr "Syötä salasana käyttäjälle %s palvelimeen %s"
 
-#: ../src/calendar/gui/e-meeting-store.c:1909
+#: ../src/calendar/gui/e-meeting-store.c:1986
 #, c-format
 msgid "Failure reason: %s"
 msgstr "Epäonnistumisen syy: %s"
 
-#: ../src/calendar/gui/e-meeting-store.c:1914
-#: ../src/e-util/e-collection-account-wizard.c:268
+#: ../src/calendar/gui/e-meeting-store.c:1991
+#: ../src/e-util/e-collection-account-wizard.c:470
 #: ../src/plugins/publish-calendar/publish-calendar.c:350
 #: ../src/smime/gui/component.c:61
 msgid "Enter password"
@@ -8661,7 +8776,7 @@ msgstr ""
 "Yhteenveto: %s\n"
 "Sijainti: %s"
 
-#: ../src/calendar/gui/e-meeting-time-sel.c:2578 ../src/calendar/gui/print.c:3525
+#: ../src/calendar/gui/e-meeting-time-sel.c:2578 ../src/calendar/gui/print.c:3534
 #, c-format
 msgid "Summary: %s"
 msgstr "Yhteenveto: %s"
@@ -8690,38 +8805,38 @@ msgstr "Yhteinen nimi"
 msgid "Language"
 msgstr "Kieli"
 
-#: ../src/calendar/gui/e-memo-table.c:455 ../src/calendar/gui/e-task-table.c:782
+#: ../src/calendar/gui/e-memo-table.c:461 ../src/calendar/gui/e-task-table.c:782
 msgid "* No Summary *"
 msgstr "* Ei yhteenvetoa *"
 
 #. Translators: This is followed by an event's start date/time
-#: ../src/calendar/gui/e-memo-table.c:540 ../src/calendar/gui/e-task-table.c:864
+#: ../src/calendar/gui/e-memo-table.c:546 ../src/calendar/gui/e-task-table.c:879
 msgid "Start: "
 msgstr "Alkaa: "
 
 #. Translators: This is followed by an event's due date/time
-#: ../src/calendar/gui/e-memo-table.c:560 ../src/calendar/gui/e-task-table.c:883
+#: ../src/calendar/gui/e-memo-table.c:566 ../src/calendar/gui/e-task-table.c:898
 msgid "Due: "
 msgstr "Erääntyy: "
 
-#: ../src/calendar/gui/e-memo-table.c:745
+#: ../src/calendar/gui/e-memo-table.c:775
 msgid "Cut selected memos to the clipboard"
 msgstr "Leikkaa valitut muistilaput leikepöydälle"
 
-#: ../src/calendar/gui/e-memo-table.c:751
+#: ../src/calendar/gui/e-memo-table.c:781
 msgid "Copy selected memos to the clipboard"
 msgstr "Kopioi valitut muistilaput leikepöydälle"
 
-#: ../src/calendar/gui/e-memo-table.c:757
+#: ../src/calendar/gui/e-memo-table.c:787
 msgid "Paste memos from the clipboard"
 msgstr "Liitä muistilaput leikepöydältä"
 
-#: ../src/calendar/gui/e-memo-table.c:763
+#: ../src/calendar/gui/e-memo-table.c:793
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:574
 msgid "Delete selected memos"
 msgstr "Poista valitut muistilaput"
 
-#: ../src/calendar/gui/e-memo-table.c:769
+#: ../src/calendar/gui/e-memo-table.c:799
 msgid "Select all visible memos"
 msgstr "Valitse kaikki näkyvissä olevat muistilaput"
 
@@ -8743,24 +8858,24 @@ msgstr "Määrittämätön"
 msgid "%d%%"
 msgstr "%d %%"
 
-#: ../src/calendar/gui/e-task-table.c:1096
+#: ../src/calendar/gui/e-task-table.c:1135
 msgid "Cut selected tasks to the clipboard"
 msgstr "Leikkaa valitut tehtävät leikepöydälle"
 
-#: ../src/calendar/gui/e-task-table.c:1102
+#: ../src/calendar/gui/e-task-table.c:1141
 msgid "Copy selected tasks to the clipboard"
 msgstr "Kopioi valitut tehtävät leikepöydälle"
 
-#: ../src/calendar/gui/e-task-table.c:1108
+#: ../src/calendar/gui/e-task-table.c:1147
 msgid "Paste tasks from the clipboard"
 msgstr "Liitä tehtävät leikepöydältä"
 
-#: ../src/calendar/gui/e-task-table.c:1114
+#: ../src/calendar/gui/e-task-table.c:1153
 #: ../src/modules/calendar/e-task-shell-view-actions.c:700
 msgid "Delete selected tasks"
 msgstr "Poista valitut tehtävät"
 
-#: ../src/calendar/gui/e-task-table.c:1120
+#: ../src/calendar/gui/e-task-table.c:1159
 msgid "Select all visible tasks"
 msgstr "Valitse kaikki näkyvissä olevat tehtävät"
 
@@ -8776,7 +8891,7 @@ msgstr "Aloituspäivä"
 msgid "Completion date"
 msgstr "Valmistumispäivä"
 
-#: ../src/calendar/gui/e-task-table.etspec.h:6 ../src/mail/mail-send-recv.c:1064
+#: ../src/calendar/gui/e-task-table.etspec.h:6 ../src/mail/mail-send-recv.c:1148
 msgid "Complete"
 msgstr "Valmis"
 
@@ -8800,92 +8915,92 @@ msgid "Select Timezone"
 msgstr "Valitse aikavyöhyke"
 
 #. Translators: It will display "Start: StartDateAndTime"
-#: ../src/calendar/gui/e-to-do-pane.c:370
+#: ../src/calendar/gui/e-to-do-pane.c:390
 #, c-format
 msgid "Start: %s"
 msgstr "Alkaa: %s"
 
 #. Translators: It will display "Due: DueDateAndTime"
-#: ../src/calendar/gui/e-to-do-pane.c:390
+#: ../src/calendar/gui/e-to-do-pane.c:410
 #, c-format
 msgid "Due: %s"
 msgstr "Erääntyy: %s"
 
 #. Translators: It will display "Completed: DateAndTimeWhenCompleted"
-#: ../src/calendar/gui/e-to-do-pane.c:404
+#: ../src/calendar/gui/e-to-do-pane.c:424
 #, fuzzy, c-format
 #| msgid "Completed "
 msgid "Completed: %s"
 msgstr "Valmis "
 
 #. strftime format of a weekday and a date.
-#: ../src/calendar/gui/e-to-do-pane.c:1452 ../src/e-util/e-cell-date-edit.c:328
-#: ../src/e-util/e-datetime-format.c:206
+#: ../src/calendar/gui/e-to-do-pane.c:1460 ../src/e-util/e-cell-date-edit.c:328
+#: ../src/e-util/e-datetime-format.c:207
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:1869
 #: ../src/modules/itip-formatter/itip-view.c:255
 msgid "Today"
 msgstr "Tänään"
 
 #. strftime format of a weekday and a date.
-#: ../src/calendar/gui/e-to-do-pane.c:1454 ../src/e-util/e-datetime-format.c:217
+#: ../src/calendar/gui/e-to-do-pane.c:1462 ../src/e-util/e-datetime-format.c:218
 #: ../src/modules/itip-formatter/itip-view.c:283
 msgid "Tomorrow"
 msgstr "Huomenna"
 
-#: ../src/calendar/gui/e-to-do-pane.c:1464
+#: ../src/calendar/gui/e-to-do-pane.c:1472
 #, fuzzy
 #| msgid "With _Due Date"
 msgid "Tasks without Due date"
 msgstr "_Eräpäivän kanssa"
 
-#: ../src/calendar/gui/e-to-do-pane.c:2037
+#: ../src/calendar/gui/e-to-do-pane.c:2045
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:1472
 msgid "New _Appointment..."
 msgstr "Uusi t_apaaminen..."
 
-#: ../src/calendar/gui/e-to-do-pane.c:2045
+#: ../src/calendar/gui/e-to-do-pane.c:2053
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:1458
 msgid "New _Meeting..."
 msgstr "Uusi _kokous..."
 
-#: ../src/calendar/gui/e-to-do-pane.c:2053
+#: ../src/calendar/gui/e-to-do-pane.c:2061
 #, fuzzy
 #| msgid "New _Task"
 msgid "New _Task..."
 msgstr "Uusi _tehtävä"
 
-#: ../src/calendar/gui/e-to-do-pane.c:2061
+#: ../src/calendar/gui/e-to-do-pane.c:2069
 #, fuzzy
 #| msgctxt "New"
 #| msgid "Assigne_d Task"
 msgid "_New Assigned Task..."
 msgstr "Tehtäväksi_anto"
 
-#: ../src/calendar/gui/e-to-do-pane.c:2074
+#: ../src/calendar/gui/e-to-do-pane.c:2082
 msgid "_Open..."
 msgstr "_Avaa..."
 
-#: ../src/calendar/gui/e-to-do-pane.c:2088
+#: ../src/calendar/gui/e-to-do-pane.c:2096
 #, fuzzy
 #| msgid "Delete This _Occurrence"
 msgid "_Delete This Instance..."
 msgstr "Poista tämä _tapahtumakerta"
 
-#: ../src/calendar/gui/e-to-do-pane.c:2096
+#: ../src/calendar/gui/e-to-do-pane.c:2104
 #, fuzzy
 #| msgid "All Instances"
 msgid "D_elete All Instances..."
 msgstr "Kaikki kerrat"
 
-#: ../src/calendar/gui/e-to-do-pane.c:2104
+#: ../src/calendar/gui/e-to-do-pane.c:2112
 msgid "_Delete..."
 msgstr "_Poista..."
 
-#: ../src/calendar/gui/e-to-do-pane.c:2121
+#: ../src/calendar/gui/e-to-do-pane.c:2129
 msgid "_Show Tasks without Due date"
 msgstr "_Näytä tehtävät ilman eräpäivää"
 
-#: ../src/calendar/gui/e-to-do-pane.c:2387
+#: ../src/calendar/gui/e-to-do-pane.c:2395
 #, fuzzy
 #| msgid "_To Do"
 msgid "To Do"
@@ -8894,36 +9009,36 @@ msgstr "Te_htävää"
 #. strftime format %d = day of month, %B = full
 #. * month name. You can change the order but don't
 #. * change the specifiers or add anything.
-#: ../src/calendar/gui/e-week-view-main-item.c:222 ../src/calendar/gui/print.c:2072
+#: ../src/calendar/gui/e-week-view-main-item.c:222 ../src/calendar/gui/print.c:2081
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../src/calendar/gui/itip-utils.c:785 ../src/calendar/gui/itip-utils.c:847
-#: ../src/calendar/gui/itip-utils.c:981
+#: ../src/calendar/gui/itip-utils.c:786 ../src/calendar/gui/itip-utils.c:848
+#: ../src/calendar/gui/itip-utils.c:982
 msgid "An organizer must be set."
 msgstr "Järjestäjä tulee asettaa."
 
-#: ../src/calendar/gui/itip-utils.c:838
+#: ../src/calendar/gui/itip-utils.c:839
 msgid "At least one attendee is necessary"
 msgstr "Vähintään yksi läsnäolija on välttämätön"
 
-#: ../src/calendar/gui/itip-utils.c:1069 ../src/calendar/gui/itip-utils.c:1230
+#: ../src/calendar/gui/itip-utils.c:1070 ../src/calendar/gui/itip-utils.c:1231
 msgid "Event information"
 msgstr "Tapahtuman tiedot"
 
-#: ../src/calendar/gui/itip-utils.c:1072 ../src/calendar/gui/itip-utils.c:1233
+#: ../src/calendar/gui/itip-utils.c:1073 ../src/calendar/gui/itip-utils.c:1234
 msgid "Task information"
 msgstr "Tehtävän tiedot"
 
-#: ../src/calendar/gui/itip-utils.c:1075 ../src/calendar/gui/itip-utils.c:1236
+#: ../src/calendar/gui/itip-utils.c:1076 ../src/calendar/gui/itip-utils.c:1237
 msgid "Memo information"
 msgstr "Muistilapun tiedot"
 
-#: ../src/calendar/gui/itip-utils.c:1078 ../src/calendar/gui/itip-utils.c:1254
+#: ../src/calendar/gui/itip-utils.c:1079 ../src/calendar/gui/itip-utils.c:1255
 msgid "Free/Busy information"
 msgstr "Vapaa/varattu-tiedot"
 
-#: ../src/calendar/gui/itip-utils.c:1081
+#: ../src/calendar/gui/itip-utils.c:1082
 msgid "Calendar information"
 msgstr "Kalenteritiedot"
 
@@ -8931,7 +9046,7 @@ msgstr "Kalenteritiedot"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Accepted: Meeting Name".
-#: ../src/calendar/gui/itip-utils.c:1118
+#: ../src/calendar/gui/itip-utils.c:1119
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "Hyväksytty"
@@ -8940,7 +9055,7 @@ msgstr "Hyväksytty"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Tentatively Accepted: Meeting Name".
-#: ../src/calendar/gui/itip-utils.c:1125
+#: ../src/calendar/gui/itip-utils.c:1126
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "Alustavasti hyväksytty"
@@ -8952,7 +9067,7 @@ msgstr "Alustavasti hyväksytty"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Declined: Meeting Name".
-#: ../src/calendar/gui/itip-utils.c:1132 ../src/calendar/gui/itip-utils.c:1180
+#: ../src/calendar/gui/itip-utils.c:1133 ../src/calendar/gui/itip-utils.c:1181
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "Hylätty"
@@ -8961,7 +9076,7 @@ msgstr "Hylätty"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Delegated: Meeting Name".
-#: ../src/calendar/gui/itip-utils.c:1139
+#: ../src/calendar/gui/itip-utils.c:1140
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "Valtuutettu"
@@ -8969,7 +9084,7 @@ msgstr "Valtuutettu"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Updated: Meeting Name".
-#: ../src/calendar/gui/itip-utils.c:1152
+#: ../src/calendar/gui/itip-utils.c:1153
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "Päivitetty"
@@ -8977,7 +9092,7 @@ msgstr "Päivitetty"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Cancel: Meeting Name".
-#: ../src/calendar/gui/itip-utils.c:1159
+#: ../src/calendar/gui/itip-utils.c:1160
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "Peru"
@@ -8985,7 +9100,7 @@ msgstr "Peru"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Refresh: Meeting Name".
-#: ../src/calendar/gui/itip-utils.c:1166
+#: ../src/calendar/gui/itip-utils.c:1167
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "Päivitä"
@@ -8993,46 +9108,46 @@ msgstr "Päivitä"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Counter-proposal: Meeting Name".
-#: ../src/calendar/gui/itip-utils.c:1173
+#: ../src/calendar/gui/itip-utils.c:1174
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "Vastaehdotus"
 
-#: ../src/calendar/gui/itip-utils.c:1251
+#: ../src/calendar/gui/itip-utils.c:1252
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Vapaa/varattu-tiedot (%s - %s)"
 
-#: ../src/calendar/gui/itip-utils.c:1259
+#: ../src/calendar/gui/itip-utils.c:1260
 msgid "iCalendar information"
 msgstr "iCalendarin tiedot"
 
-#: ../src/calendar/gui/itip-utils.c:1288
+#: ../src/calendar/gui/itip-utils.c:1289
 #, c-format
 msgid "Unable to book a resource, the new event collides with some other."
 msgstr "Resurssia ei voida varata, uusi tehtävä on ristiriidassa aiemman kanssa."
 
-#: ../src/calendar/gui/itip-utils.c:1293
+#: ../src/calendar/gui/itip-utils.c:1294
 msgid "Unable to book a resource, error: "
 msgstr "Resurssin varaaminen ei onnistu, virhe:"
 
-#: ../src/calendar/gui/itip-utils.c:1464
+#: ../src/calendar/gui/itip-utils.c:1465
 msgid "You must be an attendee of the event."
 msgstr "Sinun täytyy osallistua tapahtumaan."
 
-#: ../src/calendar/gui/itip-utils.c:2209
+#: ../src/calendar/gui/itip-utils.c:2210
 #, fuzzy
 #| msgid "Sending message"
 msgid "Sending an event"
 msgstr "Lähetetään viestiä"
 
-#: ../src/calendar/gui/itip-utils.c:2213
+#: ../src/calendar/gui/itip-utils.c:2214
 #, fuzzy
 #| msgid "Sending message"
 msgid "Sending a memo"
 msgstr "Lähetetään viestiä"
 
-#: ../src/calendar/gui/itip-utils.c:2217
+#: ../src/calendar/gui/itip-utils.c:2218
 #, fuzzy
 #| msgid "Sending Email"
 msgid "Sending a task"
@@ -9042,114 +9157,114 @@ msgstr "Lähetys"
 #. Translators: These are workday abbreviations,
 #. * e.g. Su=Sunday and Th=thursday
 #. G_DATE_MONDAY
-#: ../src/calendar/gui/print.c:721
+#: ../src/calendar/gui/print.c:733
 msgid "Mo"
 msgstr "Ma"
 
 #. G_DATE_TUESDAY
-#: ../src/calendar/gui/print.c:722
+#: ../src/calendar/gui/print.c:734
 msgid "Tu"
 msgstr "Ti"
 
 #. G_DATE_WEDNESDAY
-#: ../src/calendar/gui/print.c:723
+#: ../src/calendar/gui/print.c:735
 msgid "We"
 msgstr "Ke"
 
 #. G_DATE_THURSDAY
-#: ../src/calendar/gui/print.c:724
+#: ../src/calendar/gui/print.c:736
 msgid "Th"
 msgstr "To"
 
 #. G_DATE_FRIDAY
-#: ../src/calendar/gui/print.c:725
+#: ../src/calendar/gui/print.c:737
 msgid "Fr"
 msgstr "Pe"
 
 #. G_DATE_SATURDAY
-#: ../src/calendar/gui/print.c:726
+#: ../src/calendar/gui/print.c:738
 msgid "Sa"
 msgstr "La"
 
 #. G_DATE_SUNDAY
-#: ../src/calendar/gui/print.c:727
+#: ../src/calendar/gui/print.c:739
 msgid "Su"
 msgstr "Su"
 
 #. Translators: This is part of "START to END" text,
 #. * where START and END are date/times.
-#: ../src/calendar/gui/print.c:3318
+#: ../src/calendar/gui/print.c:3327
 msgid " to "
 msgstr " - "
 
 #. Translators: This is part of "START to END
 #. * (Completed COMPLETED)", where COMPLETED is a
 #. * completed date/time.
-#: ../src/calendar/gui/print.c:3328
+#: ../src/calendar/gui/print.c:3337
 msgid " (Completed "
 msgstr " (Valmis "
 
 #. Translators: This is part of "Completed COMPLETED",
 #. * where COMPLETED is a completed date/time.
-#: ../src/calendar/gui/print.c:3334
+#: ../src/calendar/gui/print.c:3343
 msgid "Completed "
 msgstr "Valmis "
 
 #. Translators: This is part of "START (Due DUE)",
 #. * where START and DUE are dates/times.
-#: ../src/calendar/gui/print.c:3344
+#: ../src/calendar/gui/print.c:3353
 msgid " (Due "
 msgstr " (erääntyy "
 
 #. Translators: This is part of "Due DUE",
 #. * where DUE is a date/time due the event
 #. * should be finished.
-#: ../src/calendar/gui/print.c:3351
+#: ../src/calendar/gui/print.c:3360
 msgid "Due "
 msgstr "Erääntyy "
 
-#: ../src/calendar/gui/print.c:3495
+#: ../src/calendar/gui/print.c:3504
 msgid "Appointment"
 msgstr "Tapaaminen"
 
-#: ../src/calendar/gui/print.c:3497 ../src/e-util/e-send-options.c:551
+#: ../src/calendar/gui/print.c:3506 ../src/e-util/e-send-options.c:551
 msgid "Task"
 msgstr "Tehtävä"
 
-#: ../src/calendar/gui/print.c:3499
+#: ../src/calendar/gui/print.c:3508
 msgid "Memo"
 msgstr "Muistilappu"
 
-#: ../src/calendar/gui/print.c:3555
+#: ../src/calendar/gui/print.c:3564
 msgid "Attendees: "
 msgstr "Osanottajat: "
 
-#: ../src/calendar/gui/print.c:3599
+#: ../src/calendar/gui/print.c:3608
 #, c-format
 msgid "Status: %s"
 msgstr "Tila: %s"
 
-#: ../src/calendar/gui/print.c:3615
+#: ../src/calendar/gui/print.c:3624
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioriteetti: %s"
 
-#: ../src/calendar/gui/print.c:3633
+#: ../src/calendar/gui/print.c:3642
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Valmis (%%): %i"
 
-#: ../src/calendar/gui/print.c:3647
+#: ../src/calendar/gui/print.c:3656
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../src/calendar/gui/print.c:3661
+#: ../src/calendar/gui/print.c:3670
 #, c-format
 msgid "Categories: %s"
 msgstr "Ryhmät: %s"
 
-#: ../src/calendar/gui/print.c:3672
+#: ../src/calendar/gui/print.c:3681
 msgid "Contacts: "
 msgstr "Yhteystiedot: "
 
@@ -10929,144 +11044,144 @@ msgstr "Tyyni_Valtameri/Wallis"
 msgid "Pacific/Yap"
 msgstr "Tyyni_Valtameri/Yap"
 
-#: ../src/composer/e-composer-actions.c:227
+#: ../src/composer/e-composer-actions.c:226
 msgid "Save as..."
 msgstr "Tallenna nimellä..."
 
-#: ../src/composer/e-composer-actions.c:331
+#: ../src/composer/e-composer-actions.c:321
 msgid "Close the current file"
 msgstr "Sulje nykyinen tiedosto"
 
-#: ../src/composer/e-composer-actions.c:336
+#: ../src/composer/e-composer-actions.c:326
 msgid "New _Message"
 msgstr "Uusi _viesti"
 
-#: ../src/composer/e-composer-actions.c:338
+#: ../src/composer/e-composer-actions.c:328
 msgid "Open New Message window"
 msgstr "Avaa uuden viestin luonti-ikkuna"
 
-#: ../src/composer/e-composer-actions.c:343 ../src/shell/e-shell.c:1453
-#: ../src/shell/e-shell-window-actions.c:871
+#: ../src/composer/e-composer-actions.c:333 ../src/shell/e-shell.c:1453
+#: ../src/shell/e-shell-window-actions.c:894
 msgid "_Preferences"
 msgstr "_Asetukset"
 
-#: ../src/composer/e-composer-actions.c:345 ../src/shell/e-shell-window-actions.c:873
+#: ../src/composer/e-composer-actions.c:335 ../src/shell/e-shell-window-actions.c:896
 msgid "Configure Evolution"
 msgstr "Evolutionin asetukset"
 
-#: ../src/composer/e-composer-actions.c:352
+#: ../src/composer/e-composer-actions.c:342
 msgid "Save the current file"
 msgstr "Tallenna nykyinen tiedosto"
 
-#: ../src/composer/e-composer-actions.c:357
+#: ../src/composer/e-composer-actions.c:347
 msgid "Save _As..."
 msgstr "Tallenna _nimellä..."
 
-#: ../src/composer/e-composer-actions.c:359
+#: ../src/composer/e-composer-actions.c:349
 msgid "Save the current file with a different name"
 msgstr "Tallenna tiedosto uudella nimellä"
 
-#: ../src/composer/e-composer-actions.c:366
+#: ../src/composer/e-composer-actions.c:356
 msgid "Character _Encoding"
 msgstr "M_erkistön koodaus"
 
-#: ../src/composer/e-composer-actions.c:390
+#: ../src/composer/e-composer-actions.c:380
 msgid "Print Pre_view"
 msgstr "Tulostuksen _esikatselu"
 
-#: ../src/composer/e-composer-actions.c:397
+#: ../src/composer/e-composer-actions.c:387
 msgid "Save as _Draft"
 msgstr "Tallenna _luonnoksena"
 
-#: ../src/composer/e-composer-actions.c:399
+#: ../src/composer/e-composer-actions.c:389
 msgid "Save as draft"
 msgstr "Tallenna luonnoksena"
 
-#: ../src/composer/e-composer-actions.c:404
+#: ../src/composer/e-composer-actions.c:394
 msgid "S_end"
 msgstr "_Lähetä"
 
-#: ../src/composer/e-composer-actions.c:406
+#: ../src/composer/e-composer-actions.c:396
 msgid "Send this message"
 msgstr "Lähetä viesti heti"
 
-#: ../src/composer/e-composer-actions.c:414
+#: ../src/composer/e-composer-actions.c:404
 msgid "PGP _Encrypt"
 msgstr "PGP-_salaus"
 
-#: ../src/composer/e-composer-actions.c:416
+#: ../src/composer/e-composer-actions.c:406
 msgid "Encrypt this message with PGP"
 msgstr "Salaa tämä viesti PGP:llä"
 
-#: ../src/composer/e-composer-actions.c:422
+#: ../src/composer/e-composer-actions.c:412
 msgid "PGP _Sign"
 msgstr "PGP-_allekirjoitus"
 
-#: ../src/composer/e-composer-actions.c:424
+#: ../src/composer/e-composer-actions.c:414
 msgid "Sign this message with your PGP key"
 msgstr "Allekirjoita viesti PGP-avaimellasi"
 
-#: ../src/composer/e-composer-actions.c:430
+#: ../src/composer/e-composer-actions.c:420
 msgid "_Picture Gallery"
 msgstr "_Kuvagalleria"
 
-#: ../src/composer/e-composer-actions.c:432
+#: ../src/composer/e-composer-actions.c:422
 msgid "Show a collection of pictures that you can drag to your message"
 msgstr "Näytä kokoelma kuvia, joita voi raahata viesteihin"
 
-#: ../src/composer/e-composer-actions.c:438
+#: ../src/composer/e-composer-actions.c:428
 msgid "_Prioritize Message"
 msgstr "_Aseta viestin prioriteetti"
 
-#: ../src/composer/e-composer-actions.c:440
+#: ../src/composer/e-composer-actions.c:430
 msgid "Set the message priority to high"
 msgstr "Aseta viestille korkea prioriteetti"
 
-#: ../src/composer/e-composer-actions.c:446
+#: ../src/composer/e-composer-actions.c:436
 msgid "Re_quest Read Receipt"
 msgstr "Pyydä luku_kuittausta"
 
-#: ../src/composer/e-composer-actions.c:448
+#: ../src/composer/e-composer-actions.c:438
 msgid "Get delivery notification when your message is read"
 msgstr "Pyydä lähettämään kuittaus, kun viestisi on luettu"
 
-#: ../src/composer/e-composer-actions.c:454
+#: ../src/composer/e-composer-actions.c:444
 msgid "S/MIME En_crypt"
 msgstr "S/_MIME-salaus"
 
-#: ../src/composer/e-composer-actions.c:456
+#: ../src/composer/e-composer-actions.c:446
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "Salaa viesti S/MIME-salausvarmenteellasi"
 
-#: ../src/composer/e-composer-actions.c:462
+#: ../src/composer/e-composer-actions.c:452
 msgid "S/MIME Sig_n"
 msgstr "S/MIME-a_llekirjoitus"
 
-#: ../src/composer/e-composer-actions.c:464
+#: ../src/composer/e-composer-actions.c:454
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Allekirjoita tämä viesti S/MIME-allekirjoitusvarmenteellasi"
 
-#: ../src/composer/e-composer-actions.c:518
+#: ../src/composer/e-composer-actions.c:508
 msgid "_Bcc Field"
 msgstr "_BCC-kenttä"
 
-#: ../src/composer/e-composer-actions.c:520
+#: ../src/composer/e-composer-actions.c:510
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Vaihtelee näytetäänkö BCC-kenttä"
 
-#: ../src/composer/e-composer-actions.c:526
+#: ../src/composer/e-composer-actions.c:516
 msgid "_Cc Field"
 msgstr "_Kopio-kenttä"
 
-#: ../src/composer/e-composer-actions.c:528
+#: ../src/composer/e-composer-actions.c:518
 msgid "Toggles whether the CC field is displayed"
 msgstr "Määrittää näytetäänkö Kopio-kenttä (CC)."
 
-#: ../src/composer/e-composer-actions.c:534
+#: ../src/composer/e-composer-actions.c:524
 msgid "_From Override Field"
 msgstr "_Lähettäjän korvauskenttä"
 
-#: ../src/composer/e-composer-actions.c:536
+#: ../src/composer/e-composer-actions.c:526
 #, fuzzy
 #| msgid "Toggles whether the Role field is displayed"
 msgid ""
@@ -11074,28 +11189,28 @@ msgid ""
 "displayed"
 msgstr "Määrittää näytetäänkö roolikenttä"
 
-#: ../src/composer/e-composer-actions.c:542
+#: ../src/composer/e-composer-actions.c:532
 msgid "_Reply-To Field"
 msgstr "_Vastausosoite-kenttä"
 
-#: ../src/composer/e-composer-actions.c:544
+#: ../src/composer/e-composer-actions.c:534
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Määrittää näytetäänkö Vastausosoite-kenttä"
 
-#: ../src/composer/e-composer-actions.c:550
+#: ../src/composer/e-composer-actions.c:540
 msgid "Visually _Wrap Long Lines"
 msgstr "_Rivitä visuaalisesti pitkät rivit"
 
-#: ../src/composer/e-composer-actions.c:607
+#: ../src/composer/e-composer-actions.c:597
 msgid "Attach"
 msgstr "Liitä tiedosto"
 
-#: ../src/composer/e-composer-actions.c:613
+#: ../src/composer/e-composer-actions.c:603
 msgid "Save Draft"
 msgstr "Tallenna luonnos"
 
 #: ../src/composer/e-composer-from-header.c:108
-#: ../src/e-util/e-collection-account-wizard.c:1751
+#: ../src/e-util/e-collection-account-wizard.c:1966
 #: ../src/e-util/e-mail-signature-script-dialog.c:416
 #: ../src/e-util/e-webdav-browser.c:2408
 #: ../src/e-util/gal-view-instance-save-as-dialog.ui.h:2
@@ -11162,25 +11277,25 @@ msgstr "Avaa osoitekirja tästä"
 msgid "Click here to select folders to post to"
 msgstr "Valitse tästä kansiot, joihin postituksia lähetetään"
 
-#: ../src/composer/e-msg-composer.c:998
+#: ../src/composer/e-msg-composer.c:1003
 #, c-format
 msgid "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 "Lähtevää viestiä ei voi allekirjoittaa: allekirjoitusvarmennetta ei ole asetettu "
 "tälle tilille"
 
-#: ../src/composer/e-msg-composer.c:1007
+#: ../src/composer/e-msg-composer.c:1012
 #, c-format
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this account"
 msgstr ""
 "Lähtevää viestiä ei voi salata: Salausvarmennetta ei ole asetettu tälle tilille"
 
-#: ../src/composer/e-msg-composer.c:1797 ../src/composer/e-msg-composer.c:2471
+#: ../src/composer/e-msg-composer.c:1792 ../src/composer/e-msg-composer.c:2466
 msgid "Compose Message"
 msgstr "Uusi viesti"
 
-#: ../src/composer/e-msg-composer.c:4903
+#: ../src/composer/e-msg-composer.c:4987
 msgid "The composer contains a non-text message body, which cannot be edited."
 msgstr ""
 "(Muokkain sisältää viestin rungon joka ei ole tekstiä ja jota ei voi muokata)"
@@ -11324,7 +11439,7 @@ msgstr "Ilmoitettu virhe oli “{0}”. Viestiä ei mitä luultavimmin ole talle
 msgid "An error occurred while sending. How do you want to proceed?"
 msgstr "Lähettäessä tapahtui virhe. Kuinka haluat jatkaa?"
 
-#: ../src/composer/mail-composer.error.xml.h:32 ../src/mail/mail.error.xml.h:177
+#: ../src/composer/mail-composer.error.xml.h:32 ../src/mail/mail.error.xml.h:178
 msgid "The reported error was “{0}”."
 msgstr "Ilmoitettu virhe oli “{0}”."
 
@@ -11333,7 +11448,7 @@ msgid "_Save to Outbox"
 msgstr "_Tallenna lähteviin"
 
 #: ../src/composer/mail-composer.error.xml.h:34
-#: ../src/e-util/e-collection-account-wizard.c:440
+#: ../src/e-util/e-collection-account-wizard.c:643
 msgid "_Try Again"
 msgstr "_Yritä uudelleen"
 
@@ -11491,11 +11606,11 @@ msgstr "(Ei aihetta)"
 msgid "This message was sent by %s on behalf of %s"
 msgstr "Tämä viesti lähetettiin %s käyttäjän %s puolesta"
 
-#: ../src/em-format/e-mail-formatter-image.c:178
+#: ../src/em-format/e-mail-formatter-image.c:158
 msgid "Regular Image"
 msgstr "Tavallinen kuva"
 
-#: ../src/em-format/e-mail-formatter-image.c:179
+#: ../src/em-format/e-mail-formatter-image.c:159
 #, fuzzy
 #| msgid "Display the next message"
 msgid "Display part as an image"
@@ -11528,7 +11643,7 @@ msgstr "Koko"
 #: ../src/mail/filtertypes.xml.in.h:16 ../src/mail/message-list.etspec.h:6
 #: ../src/mail/searchtypes.xml.in.h:17 ../src/mail/vfoldertypes.xml.in.h:17
 #: ../src/modules/mail/em-mailer-prefs.c:65
-#: ../src/smime/gui/certificate-manager.c:1643
+#: ../src/smime/gui/certificate-manager.c:1627
 msgid "Subject"
 msgstr "Aihe"
 
@@ -11552,19 +11667,19 @@ msgid "Display part as enriched text"
 msgstr ""
 
 #: ../src/em-format/e-mail-formatter-quote-text-html.c:93
-#: ../src/em-format/e-mail-formatter-text-html.c:385
+#: ../src/em-format/e-mail-formatter-text-html.c:386
 msgid "HTML"
 msgstr "HTML"
 
 #: ../src/em-format/e-mail-formatter-quote-text-html.c:94
-#: ../src/em-format/e-mail-formatter-text-html.c:386
+#: ../src/em-format/e-mail-formatter-text-html.c:387
 #, fuzzy
 msgid "Format part as HTML"
 msgstr "Muotoile viestit _HTML:nä"
 
 #: ../src/em-format/e-mail-formatter-quote-text-plain.c:121
 #: ../src/em-format/e-mail-formatter-text-plain.c:196
-#: ../src/e-util/e-html-editor-actions.c:1314
+#: ../src/e-util/e-html-editor-actions.c:1346
 msgid "Plain Text"
 msgstr "Raakateksti"
 
@@ -11753,8 +11868,8 @@ msgstr "osittain S/MIME-salattu"
 
 #: ../src/em-format/e-mail-formatter-utils.c:678
 #: ../src/mail/e-mail-config-security-page.c:856
-#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:272
-#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:215
+#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:273
+#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:216
 msgid "Security"
 msgstr "Turvallisuus"
 
@@ -11887,7 +12002,7 @@ msgstr "evolutionin kalenterin kohta"
 
 #: ../src/e-util/e-accounts-window.c:557 ../src/e-util/e-accounts-window.c:674
 #: ../src/e-util/e-accounts-window.c:894
-#: ../src/modules/mail/e-mail-shell-backend.c:853
+#: ../src/modules/mail/e-mail-shell-backend.c:870
 msgid "Mail Accounts"
 msgstr "Sähköpostitilit"
 
@@ -11898,25 +12013,25 @@ msgstr "Osoitekirjat"
 
 #: ../src/e-util/e-accounts-window.c:570 ../src/e-util/e-accounts-window.c:704
 #: ../src/e-util/e-accounts-window.c:909
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:85
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:86
 msgid "Calendars"
 msgstr "Kalenterit"
 
 #: ../src/e-util/e-accounts-window.c:576 ../src/e-util/e-accounts-window.c:705
 #: ../src/e-util/e-accounts-window.c:910
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:86
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:87
 msgid "Memo Lists"
 msgstr "Muistilappulistat"
 
 #: ../src/e-util/e-accounts-window.c:582 ../src/e-util/e-accounts-window.c:706
 #: ../src/e-util/e-accounts-window.c:911
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:87
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:88
 msgid "Task Lists"
 msgstr "Tehtävälistat"
 
 #: ../src/e-util/e-accounts-window.c:1399 ../src/e-util/filter.ui.h:23
 #: ../src/mail/e-mail-account-tree-view.c:84
-#: ../src/modules/mail/em-composer-prefs.c:1305
+#: ../src/modules/mail/em-composer-prefs.c:1306
 #: ../src/modules/plugin-manager/evolution-plugin-manager.c:407
 #: ../src/plugins/mail-notification/mail-notification.c:1124
 #: ../src/plugins/publish-calendar/publish-calendar.c:854
@@ -11929,10 +12044,8 @@ msgid "Account Name"
 msgstr "Tilin nimi"
 
 #: ../src/e-util/e-accounts-window.c:1482
-#, fuzzy
-#| msgid "Evolution Accounts"
 msgid "Collection _Account"
-msgstr "Evolution-tilit"
+msgstr "_Kokoelmatili"
 
 #: ../src/e-util/e-accounts-window.c:1483
 msgid "_Mail Account"
@@ -11958,21 +12071,21 @@ msgstr "Muistilappulistat"
 msgid "_Task List"
 msgstr "Tehtävälista"
 
-#: ../src/e-util/e-accounts-window.c:1682
+#: ../src/e-util/e-accounts-window.c:1684
 msgid "Evolution Accounts"
 msgstr "Evolution-tilit"
 
 #. widget = gtk_button_new_with_mnemonic (_("_Permissions"));
 #. gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0);
 #. webdav_browser->priv->permissions_button = widget;
-#: ../src/e-util/e-accounts-window.c:1758 ../src/e-util/e-webdav-browser.c:2699
+#: ../src/e-util/e-accounts-window.c:1761 ../src/e-util/e-webdav-browser.c:2699
 #: ../src/mail/em-subscription-editor.c:1950
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1475
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1546
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1561
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1632
 msgid "_Refresh"
 msgstr "_Päivitä"
 
-#: ../src/e-util/e-accounts-window.c:1759
+#: ../src/e-util/e-accounts-window.c:1762
 msgid "Initiates refresh of account sources"
 msgstr ""
 
@@ -12016,7 +12129,7 @@ msgid "%s (%d%% complete)"
 msgstr "%s (%d %% valmiina)"
 
 #: ../src/e-util/e-activity-proxy.c:350
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1658
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1744
 msgid "Cancel"
 msgstr "Peru"
 
@@ -12049,7 +12162,7 @@ msgstr "Toiminto peruttiin"
 
 #. Translators: Default attachment filename.
 #: ../src/e-util/e-attachment.c:2270 ../src/e-util/e-attachment.c:2990
-#: ../src/e-util/e-attachment.c:3442 ../src/e-util/e-attachment-store.c:887
+#: ../src/e-util/e-attachment.c:3442 ../src/e-util/e-attachment-store.c:914
 msgid "attachment.dat"
 msgstr "liite.dat"
 
@@ -12094,7 +12207,7 @@ msgid "F_ilename:"
 msgstr "_Tiedostonimi:"
 
 #: ../src/e-util/e-attachment-dialog.c:354
-#: ../src/e-util/e-html-editor-image-dialog.c:508
+#: ../src/e-util/e-html-editor-image-dialog.c:513
 #: ../src/e-util/e-html-editor-link-dialog.c:241
 #: ../src/e-util/e-webdav-browser.c:2447
 msgid "_Description:"
@@ -12104,7 +12217,7 @@ msgstr "K_uvaus:"
 msgid "MIME Type:"
 msgstr "MIME-tyyppi:"
 
-#: ../src/e-util/e-attachment-dialog.c:380 ../src/e-util/e-attachment-store.c:694
+#: ../src/e-util/e-attachment-dialog.c:380 ../src/e-util/e-attachment-store.c:700
 msgid "_Suggest automatic display of attachment"
 msgstr "_Ehdota liitteen automaattista näyttämistä"
 
@@ -12134,79 +12247,92 @@ msgstr "Piilota _liitepalkki"
 msgid "Show Attachment _Bar"
 msgstr "Näytä _liitepalkki"
 
-#: ../src/e-util/e-attachment-store.c:659
+#: ../src/e-util/e-attachment-store.c:656 ../src/e-util/e-attachment-store.c:663
 msgid "Add Attachment"
 msgstr "Lisää liite"
 
-#: ../src/e-util/e-attachment-store.c:666 ../src/e-util/e-attachment-store.c:668
+#: ../src/e-util/e-attachment-store.c:658 ../src/e-util/e-attachment-store.c:670
+#: ../src/e-util/e-attachment-store.c:672
 msgid "A_ttach"
 msgstr "Lii_tä"
 
-#: ../src/e-util/e-attachment-store.c:715
+#: ../src/e-util/e-attachment-store.c:721
 msgid "Archive selected directories using this format:"
 msgstr ""
 
-#: ../src/e-util/e-attachment-store.c:823
+#: ../src/e-util/e-attachment-store.c:838
 msgid "Save Attachment"
 msgid_plural "Save Attachments"
 msgstr[0] "Tallenna liite"
 msgstr[1] "Tallenna liitteet"
 
-#: ../src/e-util/e-attachment-store.c:850
+#: ../src/e-util/e-attachment-store.c:876
 msgid "Do _not extract files from the attachment"
 msgstr "_Älä pura tiedostoja liitteestä"
 
-#: ../src/e-util/e-attachment-store.c:855
+#: ../src/e-util/e-attachment-store.c:881
 msgid "Save extracted files _only"
 msgstr "Tallenna vain _puretut tiedostot"
 
-#: ../src/e-util/e-attachment-store.c:860
+#: ../src/e-util/e-attachment-store.c:886
 msgid "Save extracted files and the original _archive"
 msgstr "Tallenna puretut tiedostot ja a_lkuperäinen pakattu arkistotiedosto"
 
-#: ../src/e-util/e-attachment-view.c:309
+#: ../src/e-util/e-attachment-view.c:308
 msgid "Open With Other Application..."
 msgstr "Avaa tois_ella sovelluksella..."
 
-#: ../src/e-util/e-attachment-view.c:316
+#: ../src/e-util/e-attachment-view.c:315
 msgid "S_ave All"
 msgstr "Tallenna _kaikki"
 
-#: ../src/e-util/e-attachment-view.c:323
+#: ../src/e-util/e-attachment-view.c:322
 msgid "Sa_ve As"
 msgstr "_Tallenna nimellä"
 
-#: ../src/e-util/e-attachment-view.c:332
-#: ../src/plugins/save-calendar/save-calendar.c:351
-#: ../src/plugins/save-calendar/save-calendar.c:390
-#: ../src/plugins/save-calendar/save-calendar.c:429
+#: ../src/e-util/e-attachment-view.c:331
+#: ../src/plugins/save-calendar/save-calendar.c:348
+#: ../src/plugins/save-calendar/save-calendar.c:387
+#: ../src/plugins/save-calendar/save-calendar.c:426
 msgid "Save _As"
 msgstr "Tallenna _nimellä"
 
-#: ../src/e-util/e-attachment-view.c:342
+#: ../src/e-util/e-attachment-view.c:341
 msgid "A_dd Attachment..."
 msgstr "_Lisää liite..."
 
-#: ../src/e-util/e-attachment-view.c:349
+#: ../src/e-util/e-attachment-view.c:348
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1181
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:1332
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:621
 #: ../src/modules/calendar/e-task-shell-view-actions.c:747
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1468
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1539
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1554
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1625
 msgid "_Properties"
 msgstr "_Ominaisuudet"
 
-#: ../src/e-util/e-attachment-view.c:778
+#: ../src/e-util/e-attachment-view.c:786
 #, c-format
 msgid "Open With “%s”"
 msgstr "Avaa sovelluksella “%s”"
 
-#: ../src/e-util/e-attachment-view.c:781
+#: ../src/e-util/e-attachment-view.c:787
 #, c-format
 msgid "Open this attachment in %s"
 msgstr "Avaa tämä liite ohjelmalla %s"
 
+#: ../src/e-util/e-attachment-view.c:789
+#, fuzzy
+#| msgid "Open With Other Application..."
+msgid "Open With Default Application"
+msgstr "Avaa tois_ella sovelluksella..."
+
+#: ../src/e-util/e-attachment-view.c:790
+#, fuzzy
+#| msgid "Open this attachment in %s"
+msgid "Open this attachment in default application"
+msgstr "Avaa tämä liite ohjelmalla %s"
+
 #: ../src/e-util/e-book-source-config.c:98
 msgid "Mark as default address book"
 msgstr "Merkitse oletusosoitekirjaksi"
@@ -12224,40 +12350,40 @@ msgstr "Kopioi kirjan sisältö paikallisesti yhteydettömään käyttöön"
 msgid "Ctrl-click to open a link"
 msgstr "Ctrl-napsauta avataksesi linkin"
 
-#: ../src/e-util/e-calendar.c:267
+#: ../src/e-util/e-calendar.c:310
 msgid "Previous month"
 msgstr "Edellinen kuukausi"
 
-#: ../src/e-util/e-calendar.c:286
+#: ../src/e-util/e-calendar.c:329
 msgid "Next month"
 msgstr "Seuraava kuukausi"
 
-#: ../src/e-util/e-calendar.c:306
+#: ../src/e-util/e-calendar.c:349
 msgid "Previous year"
 msgstr "Edellinen vuosi"
 
-#: ../src/e-util/e-calendar.c:325
+#: ../src/e-util/e-calendar.c:368
 msgid "Next year"
 msgstr "Seuraava vuosi"
 
-#: ../src/e-util/e-calendar.c:349
+#: ../src/e-util/e-calendar.c:392
 msgid "Month Calendar"
 msgstr "Kuukausikalenteri"
 
 #. This is a strftime() format. %B = Month name.
-#: ../src/e-util/e-calendar-item.c:1333 ../src/e-util/e-calendar-item.c:2216
+#: ../src/e-util/e-calendar-item.c:1357 ../src/e-util/e-calendar-item.c:2240
 msgctxt "CalItem"
 msgid "%B"
 msgstr "%B"
 
 #. This is a strftime() format. %Y = Year.
-#: ../src/e-util/e-calendar-item.c:1335
+#: ../src/e-util/e-calendar-item.c:1359
 msgctxt "CalItem"
 msgid "%Y"
 msgstr "%Y"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../src/e-util/e-calendar-item.c:1372
+#: ../src/e-util/e-calendar-item.c:1396
 msgctxt "CalItem"
 msgid "%B %Y"
 msgstr "%B %Y"
@@ -12328,27 +12454,33 @@ msgstr "Kuvake"
 msgid "Create category “%s”"
 msgstr "Luo luokka “%s”"
 
-#: ../src/e-util/e-category-editor.c:138
+#: ../src/e-util/e-category-editor.c:169 ../src/e-util/e-category-editor.c:234
 msgid "Category Icon"
 msgstr "Luokan kuvake"
 
-#: ../src/e-util/e-category-editor.c:142
+#: ../src/e-util/e-category-editor.c:173
 msgid "_No Image"
 msgstr "_Ei kuvaa"
 
-#: ../src/e-util/e-category-editor.c:175
+#: ../src/e-util/e-category-editor.c:207
 msgid "Category _Name"
 msgstr "Luokan _nimi"
 
-#: ../src/e-util/e-category-editor.c:188
+#: ../src/e-util/e-category-editor.c:220
 msgid "Category _Icon"
 msgstr "Luokan _kuvake"
 
-#: ../src/e-util/e-category-editor.c:214
+#: ../src/e-util/e-category-editor.c:236
+#, fuzzy
+#| msgid "Insert Emoticon"
+msgid "_Unset icon"
+msgstr "Lisää hymiö"
+
+#: ../src/e-util/e-category-editor.c:262
 msgid "Category Properties"
 msgstr "Luokan ominaisuudet"
 
-#: ../src/e-util/e-category-editor.c:275
+#: ../src/e-util/e-category-editor.c:323
 #, fuzzy, c-format
 #| msgid ""
 #| "There is already a category '%s' in the configuration. Please use another name"
@@ -12361,7 +12493,7 @@ msgid "popup list"
 msgstr "ponnahduslista"
 
 #: ../src/e-util/e-cell-date.c:49 ../src/e-util/e-cell-date.c:137
-#: ../src/e-util/e-cell-date.c:157 ../src/mail/message-list.c:2112
+#: ../src/e-util/e-cell-date.c:157 ../src/mail/message-list.c:2146
 msgid "?"
 msgstr "?"
 
@@ -12484,127 +12616,148 @@ msgstr "Muut..."
 msgid "Cannot create a client object from extension name “%s”"
 msgstr ""
 
-#: ../src/e-util/e-collection-account-wizard.c:214
+#: ../src/e-util/e-collection-account-wizard.c:106
+#: ../src/modules/accounts-window/e-collection-wizard-page.c:83
+msgid "_Finish"
+msgstr "_Valmis"
+
+#: ../src/e-util/e-collection-account-wizard.c:108
+#: ../src/e-util/e-collection-account-wizard.c:266 ../src/e-util/e-search-bar.c:667
+#: ../src/modules/accounts-window/e-collection-wizard-page.c:85
+#: ../src/modules/accounts-window/e-collection-wizard-page.c:244
+msgid "_Next"
+msgstr "_Seuraava"
+
+#: ../src/e-util/e-collection-account-wizard.c:180
+msgid "New Collection Account"
+msgstr "Uusi kokoelmatili"
+
+#: ../src/e-util/e-collection-account-wizard.c:251 ../src/e-util/e-search-bar.c:655
+#: ../src/modules/accounts-window/e-collection-wizard-page.c:78
+msgid "_Previous"
+msgstr "_Edellinen"
+
+#: ../src/e-util/e-collection-account-wizard.c:416
 msgid "Looking up details, please wait…"
 msgstr "Etsitään tietoja, odota hetki…"
 
 #. Translators: The %s is replaced with a clickable text "Enter password", thus it'll be "Requires password 
to continue. Enter password." at the end.
-#: ../src/e-util/e-collection-account-wizard.c:271
+#: ../src/e-util/e-collection-account-wizard.c:473
 #, c-format
 msgid "Requires password to continue. %s."
 msgstr "Salasana vaaditaan jatkamiseksi. %s."
 
-#: ../src/e-util/e-collection-account-wizard.c:284
+#: ../src/e-util/e-collection-account-wizard.c:486
 msgid "View certificate"
 msgstr "Näytä varmenne"
 
 #. Translators: The first %s is replaced with actual error message about site certificate invalidity,
 #. like "The signing certificate authority is not known.", the second %s is replaced with a link "View 
certificate".
-#: ../src/e-util/e-collection-account-wizard.c:288
+#: ../src/e-util/e-collection-account-wizard.c:490
 #, c-format
 msgctxt "collection-account-wizard"
 msgid "%s %s."
 msgstr "%s %s."
 
-#: ../src/e-util/e-collection-account-wizard.c:326
+#: ../src/e-util/e-collection-account-wizard.c:528
 msgid ""
 "Found no candidates. It can also mean that the server doesn’t provide any "
 "information about its configuration using the selected lookup methods. Enter the "
 "account manually instead or change above settings."
 msgstr ""
 
-#: ../src/e-util/e-collection-account-wizard.c:328
+#: ../src/e-util/e-collection-account-wizard.c:530
 #, c-format
 msgid "Found one candidate"
 msgid_plural "Found %d candidates"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/e-util/e-collection-account-wizard.c:423
+#: ../src/e-util/e-collection-account-wizard.c:625
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:30
-#: ../src/smime/gui/certificate-manager.c:785
+#: ../src/smime/gui/certificate-manager.c:766
 msgid "_Password:"
 msgstr "_Salasana:"
 
-#: ../src/e-util/e-collection-account-wizard.c:434
+#: ../src/e-util/e-collection-account-wizard.c:637
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:31
 msgid "_Remember password"
 msgstr "_Muista salasana"
 
-#: ../src/e-util/e-collection-account-wizard.c:577
+#: ../src/e-util/e-collection-account-wizard.c:780
 #: ../src/e-util/e-webdav-browser.c:473
 msgid "Collection"
 msgstr "Kokoelma"
 
-#: ../src/e-util/e-collection-account-wizard.c:578
+#: ../src/e-util/e-collection-account-wizard.c:781
 #, fuzzy
 #| msgid "Mail Receipt"
 msgid "Mail Receive"
 msgstr "Sähköpostin vastaanotto"
 
-#: ../src/e-util/e-collection-account-wizard.c:579
+#: ../src/e-util/e-collection-account-wizard.c:782
 #, fuzzy
 #| msgid "Mailer"
 msgid "Mail Send"
 msgstr "Postittaja"
 
-#: ../src/e-util/e-collection-account-wizard.c:580
+#: ../src/e-util/e-collection-account-wizard.c:783
 #: ../src/e-util/e-name-selector-dialog.c:445
 #: ../src/mail/importers/pine-importer.c:430
 msgid "Address Book"
 msgstr "Osoitekirja"
 
-#: ../src/e-util/e-collection-account-wizard.c:582
+#: ../src/e-util/e-collection-account-wizard.c:785
 #, fuzzy
 #| msgid "Memo Lists"
 msgid "Memo List"
 msgstr "Muistilappulistat"
 
-#: ../src/e-util/e-collection-account-wizard.c:583
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:62
+#: ../src/e-util/e-collection-account-wizard.c:786
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:63
 msgid "Task List"
 msgstr "Tehtävälista"
 
-#: ../src/e-util/e-collection-account-wizard.c:919
+#: ../src/e-util/e-collection-account-wizard.c:1122
 msgid "Looking up LDAP server’s search base…"
 msgstr ""
 
-#: ../src/e-util/e-collection-account-wizard.c:1216
+#: ../src/e-util/e-collection-account-wizard.c:1429
 msgid "Saving account settings, please wait…"
 msgstr "Tallennetaan tilin asetuksia, odota hetki…"
 
-#: ../src/e-util/e-collection-account-wizard.c:1360
+#: ../src/e-util/e-collection-account-wizard.c:1573
 msgid "User details"
 msgstr "Käyttäjän tiedot"
 
-#: ../src/e-util/e-collection-account-wizard.c:1373
+#: ../src/e-util/e-collection-account-wizard.c:1586
 msgid "_Email Address or User name:"
 msgstr "S_ähköpostiosoite tai käyttäjätunnus:"
 
-#: ../src/e-util/e-collection-account-wizard.c:1403
+#: ../src/e-util/e-collection-account-wizard.c:1617
 msgid "_Advanced Options"
 msgstr "_Lähetysasetukset"
 
-#: ../src/e-util/e-collection-account-wizard.c:1408
-#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:216
-#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:172
+#: ../src/e-util/e-collection-account-wizard.c:1622
+#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:217
+#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:173
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:25
 msgid "_Server:"
 msgstr "_Palvelin:"
 
-#: ../src/e-util/e-collection-account-wizard.c:1426
+#: ../src/e-util/e-collection-account-wizard.c:1641
 msgid ""
 "Semicolon (“;”) separated list of servers to look up information for, in addition "
 "to the domain of the e-mail address."
 msgstr ""
 
-#: ../src/e-util/e-collection-account-wizard.c:1618
+#: ../src/e-util/e-collection-account-wizard.c:1833
 #, fuzzy
 #| msgid "Level beyond which the message should be logged."
 msgid "Select which parts should be configured:"
 msgstr "Taso, jonka jälkeen viesti kirjoitetaan lokiin."
 
-#: ../src/e-util/e-collection-account-wizard.c:1742
+#: ../src/e-util/e-collection-account-wizard.c:1957
 #: ../src/mail/e-mail-config-identity-page.c:541
 #: ../src/mail/e-mail-config-summary-page.c:323
 msgid "Account Information"
@@ -12782,8 +12935,8 @@ msgstr "valkoinen"
 
 #: ../src/e-util/e-color-combo.c:641 ../src/mail/e-mail-account-tree-view.c:135
 #: ../src/mail/e-mail-config-security-page.c:544
-#: ../src/mail/e-mail-config-security-page.c:708 ../src/mail/e-mail-reader.c:4735
-#: ../src/mail/mail-config.ui.h:76
+#: ../src/mail/e-mail-config-security-page.c:708 ../src/mail/e-mail-reader.c:4759
+#: ../src/mail/mail-config.ui.h:78
 msgid "Default"
 msgstr "Oletukset"
 
@@ -12843,14 +12996,14 @@ msgstr "Virheellinen päivämäärä"
 msgid "Invalid Time Value"
 msgstr "Virheellinen ajan kuvaus"
 
-#: ../src/e-util/e-datetime-format.c:219
+#: ../src/e-util/e-datetime-format.c:220
 msgid "Yesterday"
 msgstr "Eilen"
 
 #. Translators: This is used for abbreviated days in the future.
 #. *         You can use strftime modifiers here too, like "Next %a", to avoid
 #. * repeated translation of the abbreviated day name.
-#: ../src/e-util/e-datetime-format.c:227
+#: ../src/e-util/e-datetime-format.c:228
 msgctxt "DateFmt"
 msgid "Next Mon"
 msgstr "Seuraava ma"
@@ -12858,7 +13011,7 @@ msgstr "Seuraava ma"
 #. Translators: This is used for abbreviated days in the future.
 #. *         You can use strftime modifiers here too, like "Next %a", to avoid
 #. * repeated translation of the abbreviated day name.
-#: ../src/e-util/e-datetime-format.c:233
+#: ../src/e-util/e-datetime-format.c:234
 msgctxt "DateFmt"
 msgid "Next Tue"
 msgstr "Seuraava ti"
@@ -12866,7 +13019,7 @@ msgstr "Seuraava ti"
 #. Translators: This is used for abbreviated days in the future.
 #. *         You can use strftime modifiers here too, like "Next %a", to avoid
 #. * repeated translation of the abbreviated day name.
-#: ../src/e-util/e-datetime-format.c:239
+#: ../src/e-util/e-datetime-format.c:240
 msgctxt "DateFmt"
 msgid "Next Wed"
 msgstr "Seuraava ke"
@@ -12874,7 +13027,7 @@ msgstr "Seuraava ke"
 #. Translators: This is used for abbreviated days in the future.
 #. *         You can use strftime modifiers here too, like "Next %a", to avoid
 #. * repeated translation of the abbreviated day name.
-#: ../src/e-util/e-datetime-format.c:245
+#: ../src/e-util/e-datetime-format.c:246
 msgctxt "DateFmt"
 msgid "Next Thu"
 msgstr "Seuraava to"
@@ -12882,7 +13035,7 @@ msgstr "Seuraava to"
 #. Translators: This is used for abbreviated days in the future.
 #. *         You can use strftime modifiers here too, like "Next %a", to avoid
 #. * repeated translation of the abbreviated day name.
-#: ../src/e-util/e-datetime-format.c:251
+#: ../src/e-util/e-datetime-format.c:252
 msgctxt "DateFmt"
 msgid "Next Fri"
 msgstr "Seuraava pe"
@@ -12890,7 +13043,7 @@ msgstr "Seuraava pe"
 #. Translators: This is used for abbreviated days in the future.
 #. *         You can use strftime modifiers here too, like "Next %a", to avoid
 #. * repeated translation of the abbreviated day name.
-#: ../src/e-util/e-datetime-format.c:257
+#: ../src/e-util/e-datetime-format.c:258
 msgctxt "DateFmt"
 msgid "Next Sat"
 msgstr "Seuraava la"
@@ -12898,17 +13051,17 @@ msgstr "Seuraava la"
 #. Translators: This is used for abbreviated days in the future.
 #. *         You can use strftime modifiers here too, like "Next %a", to avoid
 #. * repeated translation of the abbreviated day name.
-#: ../src/e-util/e-datetime-format.c:263
+#: ../src/e-util/e-datetime-format.c:264
 msgctxt "DateFmt"
 msgid "Next Sun"
 msgstr "Seuraava su"
 
-#: ../src/e-util/e-datetime-format.c:349 ../src/e-util/e-datetime-format.c:359
-#: ../src/e-util/e-datetime-format.c:368
+#: ../src/e-util/e-datetime-format.c:367 ../src/e-util/e-datetime-format.c:377
+#: ../src/e-util/e-datetime-format.c:386
 msgid "Use locale default"
 msgstr "Käytä oletusaikavyöhykettä"
 
-#: ../src/e-util/e-datetime-format.c:592
+#: ../src/e-util/e-datetime-format.c:610
 msgid "Format:"
 msgstr "Muoto:"
 
@@ -12941,6 +13094,13 @@ msgstr "vuotta"
 msgid "Do not synchronize locally mails older than"
 msgstr ""
 
+#. Translators: The %s is replaced with a spin button; always keep it in the string at the right position
+#: ../src/e-util/e-dialog-widgets.c:437
+#, fuzzy, c-format
+#| msgid "_Mark messages as read after"
+msgid "Mark messages as read after %s seconds"
+msgstr "Merkitse vie_stit luetuiksi viiveellä"
+
 #. Translators: :-)
 #: ../src/e-util/e-emoticon-chooser.c:38
 msgid "_Smile"
@@ -13170,20 +13330,22 @@ msgstr[0] "yhden vuoden päässä"
 msgstr[1] "%d vuoden päässä"
 
 #: ../src/e-util/e-filter-datespec.c:127
+#, c-format
 msgid "<click here to select a date>"
 msgstr "<napsauta valitaksesi päiväys>"
 
-#: ../src/e-util/e-filter-datespec.c:130 ../src/e-util/e-filter-datespec.c:141
-#: ../src/e-util/e-filter-datespec.c:152
+#: ../src/e-util/e-filter-datespec.c:132 ../src/e-util/e-filter-datespec.c:143
+#: ../src/e-util/e-filter-datespec.c:154
+#, c-format
 msgid "now"
 msgstr "nyt"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../src/e-util/e-filter-datespec.c:137
+#: ../src/e-util/e-filter-datespec.c:139
 msgid "%d-%b-%Y"
 msgstr "%d-%b-%Y"
 
-#: ../src/e-util/e-filter-datespec.c:286
+#: ../src/e-util/e-filter-datespec.c:297
 msgid "Select a time to compare against"
 msgstr "Valitse aika johon verrataan"
 
@@ -13218,7 +13380,7 @@ msgstr "Etsi kohdat, jotka vastaavat seuraavia ehtoja"
 #: ../src/e-util/e-filter-rule.c:1080 ../src/e-util/e-html-editor-page-dialog.c:59
 #: ../src/e-util/e-mail-identity-combo-box.c:694
 #: ../src/e-util/e-mail-signature-combo-box.c:422
-#: ../src/libemail-engine/camel-null-store.c:29 ../src/mail/e-mail-autoconfig.c:741
+#: ../src/libemail-engine/camel-null-store.c:29 ../src/mail/e-mail-autoconfig.c:763
 #: ../src/mail/e-mail-config-summary-page.c:141
 #: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:684
 msgid "None"
@@ -13267,511 +13429,518 @@ msgstr "HTML-tiedoston sisällyttäminen epäonnistui."
 msgid "Failed to insert text file."
 msgstr "Tekstitiedoston sisällyttäminen epäonnistui."
 
-#: ../src/e-util/e-html-editor-actions.c:319
+#: ../src/e-util/e-html-editor-actions.c:302
 msgid "Insert HTML File"
 msgstr "Syötä HTML-tiedosto"
 
-#: ../src/e-util/e-html-editor-actions.c:325
+#: ../src/e-util/e-html-editor-actions.c:307
 msgid "HTML file"
 msgstr "HTML-tiedosto"
 
+#: ../src/e-util/e-html-editor-actions.c:345
 #: ../src/e-util/e-html-editor-actions.c:355
 msgctxt "dialog-title"
 msgid "Insert Image"
 msgstr "Sisällytä kuva"
 
-#: ../src/e-util/e-html-editor-actions.c:413
+#: ../src/e-util/e-html-editor-actions.c:352
+#, fuzzy
+#| msgid "Image files"
+msgid "Image file"
+msgstr "Kuvatiedostot"
+
+#: ../src/e-util/e-html-editor-actions.c:428
 msgid "Insert text file"
 msgstr "Sisällytä tekstitiedosto"
 
-#: ../src/e-util/e-html-editor-actions.c:419
+#: ../src/e-util/e-html-editor-actions.c:433
 msgid "Text file"
 msgstr "Tekstitiedosto"
 
-#: ../src/e-util/e-html-editor-actions.c:880
+#: ../src/e-util/e-html-editor-actions.c:912
 msgid "Copy selected text to the clipboard"
 msgstr "Kopioi valittu teksti leikepöydälle"
 
-#: ../src/e-util/e-html-editor-actions.c:887
+#: ../src/e-util/e-html-editor-actions.c:919
 msgid "Cut selected text to the clipboard"
 msgstr "Leikkaa valittu teksti leikepöydälle"
 
 #. Widgets are treating Ctrl + v shortcut themselves
-#: ../src/e-util/e-html-editor-actions.c:894
+#: ../src/e-util/e-html-editor-actions.c:926
 msgid "Paste text from the clipboard"
 msgstr "Liitä teksti leikepöydältä"
 
-#: ../src/e-util/e-html-editor-actions.c:901
+#: ../src/e-util/e-html-editor-actions.c:933
 msgid "Redo the last undone action"
 msgstr "Tee uudelleen viimeisin kumottu toiminto"
 
-#: ../src/e-util/e-html-editor-actions.c:915
+#: ../src/e-util/e-html-editor-actions.c:947
 msgid "Undo the last action"
 msgstr "Kumoa viimeisin toiminto"
 
-#: ../src/e-util/e-html-editor-actions.c:936
+#: ../src/e-util/e-html-editor-actions.c:968
 msgid "For_mat"
 msgstr "_Muotoilu"
 
-#: ../src/e-util/e-html-editor-actions.c:943
+#: ../src/e-util/e-html-editor-actions.c:975
 msgid "_Paragraph Style"
 msgstr "_Kappaleen tyyli"
 
-#: ../src/e-util/e-html-editor-actions.c:957
-#: ../src/e-util/e-html-editor-image-dialog.c:585
+#: ../src/e-util/e-html-editor-actions.c:989
+#: ../src/e-util/e-html-editor-image-dialog.c:590
 msgid "_Alignment"
 msgstr "_Tasaus"
 
-#: ../src/e-util/e-html-editor-actions.c:964
+#: ../src/e-util/e-html-editor-actions.c:996
 msgid "Current _Languages"
 msgstr "_Nykyiset kielet"
 
-#: ../src/e-util/e-html-editor-actions.c:981
+#: ../src/e-util/e-html-editor-actions.c:1013
 msgid "_Increase Indent"
 msgstr "_Lisää sisennystä"
 
-#: ../src/e-util/e-html-editor-actions.c:983
+#: ../src/e-util/e-html-editor-actions.c:1015
 msgid "Increase Indent"
 msgstr "Lisää sisennystä"
 
-#: ../src/e-util/e-html-editor-actions.c:988
+#: ../src/e-util/e-html-editor-actions.c:1020
 msgid "_HTML File..."
 msgstr "_HTML-tiedosto..."
 
-#: ../src/e-util/e-html-editor-actions.c:995
+#: ../src/e-util/e-html-editor-actions.c:1027
 msgid "Te_xt File..."
 msgstr "Te_kstitiedosto..."
 
-#: ../src/e-util/e-html-editor-actions.c:1002
+#: ../src/e-util/e-html-editor-actions.c:1034
 msgid "Paste _Quotation"
 msgstr "_Liitä lainaus"
 
-#: ../src/e-util/e-html-editor-actions.c:1009
+#: ../src/e-util/e-html-editor-actions.c:1041
 msgid "_Find..."
 msgstr "_Etsi..."
 
-#: ../src/e-util/e-html-editor-actions.c:1011
+#: ../src/e-util/e-html-editor-actions.c:1043
 msgid "Search for text"
 msgstr "Etsi tekstiä"
 
-#: ../src/e-util/e-html-editor-actions.c:1016
+#: ../src/e-util/e-html-editor-actions.c:1048
 msgid "Find A_gain"
 msgstr "Etsi _uudelleen"
 
-#: ../src/e-util/e-html-editor-actions.c:1023
+#: ../src/e-util/e-html-editor-actions.c:1055
 msgid "Re_place..."
 msgstr "_Korvaa..."
 
-#: ../src/e-util/e-html-editor-actions.c:1025
+#: ../src/e-util/e-html-editor-actions.c:1057
 msgid "Search for and replace text"
 msgstr "Etsi ja korvaa tekstiä"
 
-#: ../src/e-util/e-html-editor-actions.c:1030
+#: ../src/e-util/e-html-editor-actions.c:1062
 msgid "Check _Spelling..."
 msgstr "_Oikolue..."
 
-#: ../src/e-util/e-html-editor-actions.c:1037
+#: ../src/e-util/e-html-editor-actions.c:1069
 msgid "_Decrease Indent"
 msgstr "_Vähennä sisennystä"
 
-#: ../src/e-util/e-html-editor-actions.c:1039
+#: ../src/e-util/e-html-editor-actions.c:1071
 msgid "Decrease Indent"
 msgstr "Vähennä sisennystä"
 
-#: ../src/e-util/e-html-editor-actions.c:1044
+#: ../src/e-util/e-html-editor-actions.c:1076
 msgid "_Wrap Lines"
 msgstr "_Rivitä teksti"
 
 #. Center
-#: ../src/e-util/e-html-editor-actions.c:1054
+#: ../src/e-util/e-html-editor-actions.c:1086
 #: ../src/e-util/e-html-editor-paragraph-dialog.c:108
 msgid "_Center"
 msgstr "_Keskelle"
 
-#: ../src/e-util/e-html-editor-actions.c:1056
+#: ../src/e-util/e-html-editor-actions.c:1088
 msgid "Center Alignment"
 msgstr "Tasaus keskelle"
 
 #. Left
-#: ../src/e-util/e-html-editor-actions.c:1061
+#: ../src/e-util/e-html-editor-actions.c:1093
 #: ../src/e-util/e-html-editor-paragraph-dialog.c:99
 msgid "_Left"
 msgstr "_Vasemmalle"
 
-#: ../src/e-util/e-html-editor-actions.c:1063
+#: ../src/e-util/e-html-editor-actions.c:1095
 msgid "Left Alignment"
 msgstr "Tasaus vasemmalle"
 
 #. Right
-#: ../src/e-util/e-html-editor-actions.c:1068
+#: ../src/e-util/e-html-editor-actions.c:1100
 #: ../src/e-util/e-html-editor-paragraph-dialog.c:117
 msgid "_Right"
 msgstr "_Oikealle"
 
-#: ../src/e-util/e-html-editor-actions.c:1070
+#: ../src/e-util/e-html-editor-actions.c:1102
 msgid "Right Alignment"
 msgstr "Tasaus oikealle"
 
-#: ../src/e-util/e-html-editor-actions.c:1078
+#: ../src/e-util/e-html-editor-actions.c:1110
 #: ../src/modules/text-highlight/languages.c:70
 msgid "_HTML"
 msgstr "_HTML"
 
-#: ../src/e-util/e-html-editor-actions.c:1080
+#: ../src/e-util/e-html-editor-actions.c:1112
 msgid "HTML editing mode"
 msgstr "HTML-muokkaustila"
 
-#: ../src/e-util/e-html-editor-actions.c:1085
+#: ../src/e-util/e-html-editor-actions.c:1117
 msgid "Plain _Text"
 msgstr "Raaka_teksti"
 
-#: ../src/e-util/e-html-editor-actions.c:1087
+#: ../src/e-util/e-html-editor-actions.c:1119
 msgid "Plain text editing mode"
 msgstr "Raakatekstin muokkaustila"
 
-#: ../src/e-util/e-html-editor-actions.c:1095
+#: ../src/e-util/e-html-editor-actions.c:1127
 msgid "_Normal"
 msgstr "_Tavallinen"
 
-#: ../src/e-util/e-html-editor-actions.c:1102
+#: ../src/e-util/e-html-editor-actions.c:1134
 msgid "Heading _1"
 msgstr "Otsake _1"
 
-#: ../src/e-util/e-html-editor-actions.c:1109
+#: ../src/e-util/e-html-editor-actions.c:1141
 msgid "Heading _2"
 msgstr "Otsake _2"
 
-#: ../src/e-util/e-html-editor-actions.c:1116
+#: ../src/e-util/e-html-editor-actions.c:1148
 msgid "Heading _3"
 msgstr "Otsake _3"
 
-#: ../src/e-util/e-html-editor-actions.c:1123
+#: ../src/e-util/e-html-editor-actions.c:1155
 msgid "Heading _4"
 msgstr "Otsake _4"
 
-#: ../src/e-util/e-html-editor-actions.c:1130
+#: ../src/e-util/e-html-editor-actions.c:1162
 msgid "Heading _5"
 msgstr "Otsake _5"
 
-#: ../src/e-util/e-html-editor-actions.c:1137
+#: ../src/e-util/e-html-editor-actions.c:1169
 msgid "Heading _6"
 msgstr "Otsake _6"
 
-#: ../src/e-util/e-html-editor-actions.c:1144
+#: ../src/e-util/e-html-editor-actions.c:1176
 msgid "_Preformatted"
 msgstr "_Esimuotoiltu"
 
-#: ../src/e-util/e-html-editor-actions.c:1151
+#: ../src/e-util/e-html-editor-actions.c:1183
 msgid "A_ddress"
 msgstr "_Osoite"
 
-#: ../src/e-util/e-html-editor-actions.c:1158
+#: ../src/e-util/e-html-editor-actions.c:1190
 msgid "_Bulleted List"
 msgstr "_Merkitty luettelo"
 
-#: ../src/e-util/e-html-editor-actions.c:1165
+#: ../src/e-util/e-html-editor-actions.c:1197
 msgid "_Roman Numeral List"
 msgstr "_Roomalaisnumeerinen luettelo"
 
-#: ../src/e-util/e-html-editor-actions.c:1172
+#: ../src/e-util/e-html-editor-actions.c:1204
 msgid "Numbered _List"
 msgstr "Numeerinen _luettelo"
 
-#: ../src/e-util/e-html-editor-actions.c:1179
+#: ../src/e-util/e-html-editor-actions.c:1211
 msgid "_Alphabetical List"
 msgstr "_Aakkosellinen luettelo"
 
-#: ../src/e-util/e-html-editor-actions.c:1195
-#: ../src/e-util/e-html-editor-actions.c:1233
+#: ../src/e-util/e-html-editor-actions.c:1227
+#: ../src/e-util/e-html-editor-actions.c:1265
 msgid "_Image..."
 msgstr "_Kuva..."
 
 #. Translators: This is an action tooltip
-#: ../src/e-util/e-html-editor-actions.c:1198
+#: ../src/e-util/e-html-editor-actions.c:1230
 msgid "Insert Image"
 msgstr "Sisällytä kuva"
 
-#: ../src/e-util/e-html-editor-actions.c:1203
-#: ../src/e-util/e-html-editor-actions.c:1240
+#: ../src/e-util/e-html-editor-actions.c:1235
+#: ../src/e-util/e-html-editor-actions.c:1272
 msgid "_Link..."
 msgstr "_Linkki..."
 
-#: ../src/e-util/e-html-editor-actions.c:1205
+#: ../src/e-util/e-html-editor-actions.c:1237
 msgid "Insert Link"
 msgstr "Lisää linkki"
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../src/e-util/e-html-editor-actions.c:1211
-#: ../src/e-util/e-html-editor-actions.c:1255
+#: ../src/e-util/e-html-editor-actions.c:1243
+#: ../src/e-util/e-html-editor-actions.c:1287
 msgid "_Rule..."
 msgstr "_Viiva..."
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../src/e-util/e-html-editor-actions.c:1214
+#: ../src/e-util/e-html-editor-actions.c:1246
 msgid "Insert Rule"
 msgstr "Lisää viiva"
 
-#: ../src/e-util/e-html-editor-actions.c:1219
-#: ../src/e-util/e-html-editor-actions.c:1262
+#: ../src/e-util/e-html-editor-actions.c:1251
+#: ../src/e-util/e-html-editor-actions.c:1294
 msgid "_Table..."
 msgstr "_Taulukko..."
 
-#: ../src/e-util/e-html-editor-actions.c:1221
+#: ../src/e-util/e-html-editor-actions.c:1253
 msgid "Insert Table"
 msgstr "Lisää taulukko"
 
-#: ../src/e-util/e-html-editor-actions.c:1226
+#: ../src/e-util/e-html-editor-actions.c:1258
 msgid "_Cell..."
 msgstr "_Solu..."
 
-#: ../src/e-util/e-html-editor-actions.c:1247
+#: ../src/e-util/e-html-editor-actions.c:1279
 msgid "Pa_ge..."
 msgstr "Si_vu..."
 
-#: ../src/e-util/e-html-editor-actions.c:1271
+#: ../src/e-util/e-html-editor-actions.c:1303
 msgid "Font _Size"
 msgstr "Fontin _koko"
 
-#: ../src/e-util/e-html-editor-actions.c:1278
+#: ../src/e-util/e-html-editor-actions.c:1310
 msgid "_Font Style"
 msgstr "_Fontin tyyli"
 
-#: ../src/e-util/e-html-editor-actions.c:1285
+#: ../src/e-util/e-html-editor-actions.c:1317
 msgid "Paste As _Text"
 msgstr "Liitä _tekstinä"
 
-#: ../src/e-util/e-html-editor-actions.c:1296
+#: ../src/e-util/e-html-editor-actions.c:1328
 #: ../src/e-util/e-html-editor-text-dialog.c:201
 msgid "_Bold"
 msgstr "_Lihavoitu"
 
-#: ../src/e-util/e-html-editor-actions.c:1298
+#: ../src/e-util/e-html-editor-actions.c:1330
 msgid "Bold"
 msgstr "Lihavoitu"
 
-#: ../src/e-util/e-html-editor-actions.c:1304
+#: ../src/e-util/e-html-editor-actions.c:1336
 #: ../src/e-util/e-html-editor-text-dialog.c:212
 msgid "_Italic"
 msgstr "_Kursivoitu"
 
-#: ../src/e-util/e-html-editor-actions.c:1306
+#: ../src/e-util/e-html-editor-actions.c:1338
 msgid "Italic"
 msgstr "Kursivoitu"
 
-#: ../src/e-util/e-html-editor-actions.c:1312
+#: ../src/e-util/e-html-editor-actions.c:1344
 msgid "_Plain Text"
 msgstr "_Raakateksti"
 
-#: ../src/e-util/e-html-editor-actions.c:1320
+#: ../src/e-util/e-html-editor-actions.c:1352
 #: ../src/e-util/e-html-editor-text-dialog.c:233
 msgid "_Strikethrough"
 msgstr "_Yliviivattu"
 
-#: ../src/e-util/e-html-editor-actions.c:1322
+#: ../src/e-util/e-html-editor-actions.c:1354
 msgid "Strikethrough"
 msgstr "Yliviivattu"
 
-#: ../src/e-util/e-html-editor-actions.c:1328
+#: ../src/e-util/e-html-editor-actions.c:1360
 #: ../src/e-util/e-html-editor-text-dialog.c:223
 msgid "_Underline"
 msgstr "_Alleviivattu"
 
-#: ../src/e-util/e-html-editor-actions.c:1330
+#: ../src/e-util/e-html-editor-actions.c:1362
 msgid "Underline"
 msgstr "Alleviivattu"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../src/e-util/e-html-editor-actions.c:1340
+#: ../src/e-util/e-html-editor-actions.c:1372
 msgid "-2"
 msgstr "-2"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../src/e-util/e-html-editor-actions.c:1348
+#: ../src/e-util/e-html-editor-actions.c:1380
 msgid "-1"
 msgstr "-1"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../src/e-util/e-html-editor-actions.c:1356
+#: ../src/e-util/e-html-editor-actions.c:1388
 msgid "+0"
 msgstr "+0"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../src/e-util/e-html-editor-actions.c:1364
+#: ../src/e-util/e-html-editor-actions.c:1396
 msgid "+1"
 msgstr "+1"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../src/e-util/e-html-editor-actions.c:1372
+#: ../src/e-util/e-html-editor-actions.c:1404
 msgid "+2"
 msgstr "+2"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../src/e-util/e-html-editor-actions.c:1380
+#: ../src/e-util/e-html-editor-actions.c:1412
 msgid "+3"
 msgstr "+3"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../src/e-util/e-html-editor-actions.c:1388
+#: ../src/e-util/e-html-editor-actions.c:1420
 msgid "+4"
 msgstr "+4"
 
-#: ../src/e-util/e-html-editor-actions.c:1407
+#: ../src/e-util/e-html-editor-actions.c:1439
 msgid "Cell Contents"
 msgstr "Solun sisältö"
 
-#: ../src/e-util/e-html-editor-actions.c:1414
+#: ../src/e-util/e-html-editor-actions.c:1446
 msgid "Column"
 msgstr "Sarake"
 
-#: ../src/e-util/e-html-editor-actions.c:1421
+#: ../src/e-util/e-html-editor-actions.c:1453
 msgid "Row"
 msgstr "Rivi"
 
-#: ../src/e-util/e-html-editor-actions.c:1428
+#: ../src/e-util/e-html-editor-actions.c:1460
 msgid "Table"
 msgstr "Taulukko"
 
 #. Translators: Popup menu item caption, containing all the Delete options for a table
-#: ../src/e-util/e-html-editor-actions.c:1438
+#: ../src/e-util/e-html-editor-actions.c:1470
 msgid "Table Delete"
 msgstr "Taulukon poisto"
 
 #. Translators: Popup menu item caption, containing all the Insert options for a table
-#: ../src/e-util/e-html-editor-actions.c:1446
+#: ../src/e-util/e-html-editor-actions.c:1478
 msgid "Table Insert"
 msgstr "Taulukon lisäys"
 
-#: ../src/e-util/e-html-editor-actions.c:1453
+#: ../src/e-util/e-html-editor-actions.c:1485
 msgid "Properties"
 msgstr "Ominaisuudet"
 
-#: ../src/e-util/e-html-editor-actions.c:1471
+#: ../src/e-util/e-html-editor-actions.c:1503
 msgid "Column After"
 msgstr "Sarake ennen"
 
-#: ../src/e-util/e-html-editor-actions.c:1478
+#: ../src/e-util/e-html-editor-actions.c:1510
 msgid "Column Before"
 msgstr "Sarake jälkeen"
 
-#: ../src/e-util/e-html-editor-actions.c:1485
+#: ../src/e-util/e-html-editor-actions.c:1517
 msgid "Insert _Link"
 msgstr "L_isää linkki"
 
-#: ../src/e-util/e-html-editor-actions.c:1492
+#: ../src/e-util/e-html-editor-actions.c:1524
 msgid "Row Above"
 msgstr "Rivi ylös"
 
-#: ../src/e-util/e-html-editor-actions.c:1499
+#: ../src/e-util/e-html-editor-actions.c:1531
 msgid "Row Below"
 msgstr "Rivi alas"
 
-#: ../src/e-util/e-html-editor-actions.c:1506
+#: ../src/e-util/e-html-editor-actions.c:1538
 msgid "Cell..."
 msgstr "Solu..."
 
-#: ../src/e-util/e-html-editor-actions.c:1513
+#: ../src/e-util/e-html-editor-actions.c:1545
 msgid "Image..."
 msgstr "Kuva..."
 
-#: ../src/e-util/e-html-editor-actions.c:1520
+#: ../src/e-util/e-html-editor-actions.c:1552
 msgid "Link..."
 msgstr "Linkki..."
 
-#: ../src/e-util/e-html-editor-actions.c:1527
+#: ../src/e-util/e-html-editor-actions.c:1559
 msgid "Page..."
 msgstr "Sivu..."
 
-#: ../src/e-util/e-html-editor-actions.c:1534
+#: ../src/e-util/e-html-editor-actions.c:1566
 msgid "Paragraph..."
 msgstr "Kappale..."
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../src/e-util/e-html-editor-actions.c:1542
+#: ../src/e-util/e-html-editor-actions.c:1574
 msgid "Rule..."
 msgstr "Viiva..."
 
-#: ../src/e-util/e-html-editor-actions.c:1549
+#: ../src/e-util/e-html-editor-actions.c:1581
 msgid "Table..."
 msgstr "Taulukko..."
 
-#: ../src/e-util/e-html-editor-actions.c:1556
+#: ../src/e-util/e-html-editor-actions.c:1588
 msgid "Text..."
 msgstr "Text..."
 
-#: ../src/e-util/e-html-editor-actions.c:1563
+#: ../src/e-util/e-html-editor-actions.c:1595
 msgid "Remove Link"
 msgstr "Poista linkki"
 
-#: ../src/e-util/e-html-editor-actions.c:1580
+#: ../src/e-util/e-html-editor-actions.c:1612
 msgid "Add Word to Dictionary"
 msgstr "Lisää sana sanastoon"
 
-#: ../src/e-util/e-html-editor-actions.c:1587
+#: ../src/e-util/e-html-editor-actions.c:1619
 #, fuzzy
 #| msgid "Color for _misspelled words:"
 msgid "Ignore Misspelled Word"
 msgstr "_Väärin kirjoitettujen sanojen väri:"
 
-#: ../src/e-util/e-html-editor-actions.c:1594
+#: ../src/e-util/e-html-editor-actions.c:1626
 msgid "Add Word To"
 msgstr ""
 
-#: ../src/e-util/e-html-editor-actions.c:1603
+#: ../src/e-util/e-html-editor-actions.c:1635
 msgid "More Suggestions"
 msgstr "Lisää ehdotuksia"
 
 #. Translators: %s will be replaced with the actual dictionary
 #. * name, where a user can add a word to. This is part of an
 #. * "Add Word To" submenu.
-#: ../src/e-util/e-html-editor-actions.c:1727
+#: ../src/e-util/e-html-editor-actions.c:1870
 #, fuzzy, c-format
 #| msgid "Add \"%s\" to Dictionary"
 msgid "%s Dictionary"
 msgstr "Lisää \"%s\" sanastoon"
 
-#: ../src/e-util/e-html-editor-actions.c:1806
+#: ../src/e-util/e-html-editor-actions.c:1949
 msgid "_Emoticon"
 msgstr "_Hymiö"
 
-#: ../src/e-util/e-html-editor-actions.c:1807
+#: ../src/e-util/e-html-editor-actions.c:1950
 msgid "Insert Emoticon"
 msgstr "Lisää hymiö"
 
-#: ../src/e-util/e-html-editor-actions.c:1875
+#: ../src/e-util/e-html-editor-actions.c:2018
 msgid "Re_place"
 msgstr "_Korvaa"
 
-#: ../src/e-util/e-html-editor-actions.c:1878
+#: ../src/e-util/e-html-editor-actions.c:2021
 msgid "_Image"
 msgstr "_Kuva"
 
-#: ../src/e-util/e-html-editor-actions.c:1881
+#: ../src/e-util/e-html-editor-actions.c:2024
 msgid "_Link"
 msgstr "_Linkki"
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../src/e-util/e-html-editor-actions.c:1885
+#: ../src/e-util/e-html-editor-actions.c:2028
 msgid "_Rule"
 msgstr "_Viiva"
 
-#: ../src/e-util/e-html-editor-actions.c:1888
+#: ../src/e-util/e-html-editor-actions.c:2031
 #: ../src/e-util/e-html-editor-cell-dialog.c:448
 msgid "_Table"
 msgstr "_Taulukko"
 
-#: ../src/e-util/e-html-editor.c:742
+#: ../src/e-util/e-html-editor.c:743
 msgid "Paragraph Style"
 msgstr "Kappaleen tyyli"
 
-#: ../src/e-util/e-html-editor.c:756
+#: ../src/e-util/e-html-editor.c:757
 msgid "Editing Mode"
 msgstr "Muokkaustila"
 
-#: ../src/e-util/e-html-editor.c:768
+#: ../src/e-util/e-html-editor.c:769
 msgid "Font Color"
 msgstr "Fontin väri"
 
-#: ../src/e-util/e-html-editor.c:778
+#: ../src/e-util/e-html-editor.c:779
 msgid "Font Size"
 msgstr "Fontin koko"
 
@@ -13797,19 +13966,19 @@ msgstr ""
 
 #: ../src/e-util/e-html-editor-cell-dialog.c:484
 #: ../src/e-util/e-html-editor-hrule-dialog.c:328
-#: ../src/e-util/e-html-editor-table-dialog.c:649
+#: ../src/e-util/e-html-editor-table-dialog.c:648
 msgid "Left"
 msgstr "Vasen"
 
 #: ../src/e-util/e-html-editor-cell-dialog.c:485
 #: ../src/e-util/e-html-editor-hrule-dialog.c:330
-#: ../src/e-util/e-html-editor-table-dialog.c:650
+#: ../src/e-util/e-html-editor-table-dialog.c:649
 msgid "Center"
 msgstr ""
 
 #: ../src/e-util/e-html-editor-cell-dialog.c:486
 #: ../src/e-util/e-html-editor-hrule-dialog.c:332
-#: ../src/e-util/e-html-editor-table-dialog.c:651
+#: ../src/e-util/e-html-editor-table-dialog.c:650
 msgid "Right"
 msgstr "Oikea"
 
@@ -13818,21 +13987,21 @@ msgid "_Horizontal:"
 msgstr ""
 
 #: ../src/e-util/e-html-editor-cell-dialog.c:502
-#: ../src/e-util/e-html-editor-image-dialog.c:575
+#: ../src/e-util/e-html-editor-image-dialog.c:580
 #, fuzzy
 #| msgid "_Top"
 msgid "Top"
 msgstr "Ylimm_äiseksi"
 
 #: ../src/e-util/e-html-editor-cell-dialog.c:503
-#: ../src/e-util/e-html-editor-image-dialog.c:576
+#: ../src/e-util/e-html-editor-image-dialog.c:581
 #, fuzzy
 #| msgid "_Middle:"
 msgid "Middle"
 msgstr "_Toinen nimi:"
 
 #: ../src/e-util/e-html-editor-cell-dialog.c:504
-#: ../src/e-util/e-html-editor-image-dialog.c:577
+#: ../src/e-util/e-html-editor-image-dialog.c:582
 #, fuzzy
 #| msgid "_Bottom"
 msgid "Bottom"
@@ -13855,8 +14024,8 @@ msgid "_Header Style"
 msgstr "_Otsaketyyli"
 
 #: ../src/e-util/e-html-editor-cell-dialog.c:540
-#: ../src/e-util/e-html-editor-image-dialog.c:515
-#: ../src/e-util/e-html-editor-table-dialog.c:561
+#: ../src/e-util/e-html-editor-image-dialog.c:520
+#: ../src/e-util/e-html-editor-table-dialog.c:560
 msgid "<b>Layout</b>"
 msgstr "<b>Asettelu</b>"
 
@@ -13874,42 +14043,45 @@ msgid "Co_lumn Span:"
 msgstr ""
 
 #: ../src/e-util/e-html-editor-cell-dialog.c:612
-#: ../src/e-util/e-html-editor-table-dialog.c:665
+#: ../src/e-util/e-html-editor-table-dialog.c:664
 msgid "<b>Background</b>"
 msgstr "<b>Tausta</b>"
 
 #: ../src/e-util/e-html-editor-cell-dialog.c:625
-#: ../src/e-util/e-html-editor-table-dialog.c:678
+#: ../src/e-util/e-html-editor-table-dialog.c:677
 msgid "Transparent"
 msgstr "Läpinäkyvä"
 
 #: ../src/e-util/e-html-editor-cell-dialog.c:633
 msgid "C_olor:"
-msgstr "V_äri:"
-
-#: ../src/e-util/e-html-editor-cell-dialog.c:641
-#: ../src/e-util/e-html-editor-image-dialog.c:477
-#: ../src/e-util/e-html-editor-table-dialog.c:694
-msgid "Choose Background Image"
-msgstr "Valitse taustakuva"
+msgstr "V_äri:"
 
-#: ../src/e-util/e-html-editor-cell-dialog.c:646
-#: ../src/e-util/e-html-editor-image-dialog.c:483
-#: ../src/e-util/e-html-editor-table-dialog.c:699
+#: ../src/e-util/e-html-editor-cell-dialog.c:640
+#: ../src/e-util/e-html-editor-image-dialog.c:476
+#: ../src/e-util/e-html-editor-table-dialog.c:692
 msgid "Images"
 msgstr "Kuvat"
 
-#: ../src/e-util/e-html-editor-cell-dialog.c:659
+#: ../src/e-util/e-html-editor-cell-dialog.c:645
+#: ../src/e-util/e-html-editor-cell-dialog.c:648
+#: ../src/e-util/e-html-editor-image-dialog.c:481
+#: ../src/e-util/e-html-editor-image-dialog.c:484
+#: ../src/e-util/e-html-editor-table-dialog.c:697
+#: ../src/e-util/e-html-editor-table-dialog.c:702
+msgid "Choose Background Image"
+msgstr "Valitse taustakuva"
+
+#: ../src/e-util/e-html-editor-cell-dialog.c:662
 msgid "_Image:"
 msgstr "_Kuva:"
 
-#: ../src/e-util/e-html-editor-cell-dialog.c:666
+#: ../src/e-util/e-html-editor-cell-dialog.c:669
 #: ../src/e-util/e-html-editor-page-dialog.c:495
-#: ../src/e-util/e-html-editor-table-dialog.c:719
+#: ../src/e-util/e-html-editor-table-dialog.c:723
 msgid "_Remove image"
 msgstr "_Poista kuva"
 
-#: ../src/e-util/e-html-editor-cell-dialog.c:686
+#: ../src/e-util/e-html-editor-cell-dialog.c:689
 msgid "Cell Properties"
 msgstr "Solun ominaisuudet"
 
@@ -13943,8 +14115,8 @@ msgstr "<b>Koko</b>"
 
 #. Width
 #: ../src/e-util/e-html-editor-hrule-dialog.c:283
-#: ../src/e-util/e-html-editor-image-dialog.c:533
-#: ../src/e-util/e-html-editor-table-dialog.c:572
+#: ../src/e-util/e-html-editor-image-dialog.c:538
+#: ../src/e-util/e-html-editor-table-dialog.c:571
 msgid "_Width:"
 msgstr "_Leveys:"
 
@@ -13957,7 +14129,7 @@ msgid "<b>Style</b>"
 msgstr "<b>Tyyli</b>"
 
 #: ../src/e-util/e-html-editor-hrule-dialog.c:340
-#: ../src/e-util/e-html-editor-table-dialog.c:658
+#: ../src/e-util/e-html-editor-table-dialog.c:657
 msgid "_Alignment:"
 msgstr "_Tasaus:"
 
@@ -13974,46 +14146,46 @@ msgstr "Kansion ominaisuudet"
 
 #: ../src/e-util/e-html-editor-image-dialog.c:465
 #: ../src/e-util/e-html-editor-paragraph-dialog.c:64
-#: ../src/e-util/e-html-editor-table-dialog.c:515
+#: ../src/e-util/e-html-editor-table-dialog.c:514
 msgid "<b>General</b>"
 msgstr "<b>Yleiset</b>"
 
-#: ../src/e-util/e-html-editor-image-dialog.c:494
+#: ../src/e-util/e-html-editor-image-dialog.c:499
 msgid "_Source:"
 msgstr "_Lähde:"
 
-#: ../src/e-util/e-html-editor-image-dialog.c:557
+#: ../src/e-util/e-html-editor-image-dialog.c:562
 msgid "_Height:"
 msgstr "_Korkeus:"
 
-#: ../src/e-util/e-html-editor-image-dialog.c:598
+#: ../src/e-util/e-html-editor-image-dialog.c:603
 msgid "_X-Padding:"
 msgstr ""
 
-#: ../src/e-util/e-html-editor-image-dialog.c:614
+#: ../src/e-util/e-html-editor-image-dialog.c:619
 msgid "_Y-Padding:"
 msgstr ""
 
-#: ../src/e-util/e-html-editor-image-dialog.c:630
-#: ../src/e-util/e-html-editor-table-dialog.c:639
+#: ../src/e-util/e-html-editor-image-dialog.c:635
+#: ../src/e-util/e-html-editor-table-dialog.c:638
 msgid "_Border:"
 msgstr "_Reunus:"
 
-#: ../src/e-util/e-html-editor-image-dialog.c:640
+#: ../src/e-util/e-html-editor-image-dialog.c:645
 msgid "<b>Link</b>"
 msgstr "<b>Linkki</b>"
 
-#: ../src/e-util/e-html-editor-image-dialog.c:658
+#: ../src/e-util/e-html-editor-image-dialog.c:663
 #: ../src/e-util/e-html-editor-link-dialog.c:219
 msgid "_URL:"
 msgstr "_Osoite:"
 
-#: ../src/e-util/e-html-editor-image-dialog.c:663
+#: ../src/e-util/e-html-editor-image-dialog.c:668
 #: ../src/e-util/e-html-editor-link-dialog.c:224
 msgid "_Test URL..."
 msgstr "_Testaa osoite..."
 
-#: ../src/e-util/e-html-editor-image-dialog.c:680
+#: ../src/e-util/e-html-editor-image-dialog.c:685
 msgid "Image Properties"
 msgstr "Kuvan ominaisuudet"
 
@@ -14079,7 +14251,7 @@ msgid "<b>Background Image</b>"
 msgstr "<b>Taustakuva</b>"
 
 #: ../src/e-util/e-html-editor-page-dialog.c:473
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:89
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:90
 msgid "_Template:"
 msgstr "_Malli:"
 
@@ -14199,39 +14371,39 @@ msgid "Add word"
 msgstr "Lisää sana"
 
 #: ../src/e-util/e-html-editor-spell-check-dialog.c:505
-#: ../src/mail/mail-config.ui.h:40
+#: ../src/mail/mail-config.ui.h:42
 msgid "Spell Checking"
 msgstr "Oikoluku"
 
-#: ../src/e-util/e-html-editor-table-dialog.c:537
+#: ../src/e-util/e-html-editor-table-dialog.c:536
 msgid "_Rows:"
 msgstr "_Rivejä:"
 
-#: ../src/e-util/e-html-editor-table-dialog.c:554
+#: ../src/e-util/e-html-editor-table-dialog.c:553
 msgid "C_olumns:"
 msgstr "_Sarakkeita:"
 
-#: ../src/e-util/e-html-editor-table-dialog.c:605
+#: ../src/e-util/e-html-editor-table-dialog.c:604
 msgid "_Spacing:"
 msgstr "_Välistys:"
 
-#: ../src/e-util/e-html-editor-table-dialog.c:622
+#: ../src/e-util/e-html-editor-table-dialog.c:621
 #, fuzzy
 #| msgid "Loading"
 msgid "_Padding:"
 msgstr "Ladataan"
 
-#: ../src/e-util/e-html-editor-table-dialog.c:686
+#: ../src/e-util/e-html-editor-table-dialog.c:685
 #: ../src/e-util/e-html-editor-text-dialog.c:248
 #: ../src/e-util/e-webdav-browser.c:2418
 msgid "_Color:"
 msgstr "_Väri:"
 
-#: ../src/e-util/e-html-editor-table-dialog.c:712
+#: ../src/e-util/e-html-editor-table-dialog.c:716
 msgid "Image:"
 msgstr "Kuva:"
 
-#: ../src/e-util/e-html-editor-table-dialog.c:739
+#: ../src/e-util/e-html-editor-table-dialog.c:743
 msgid "Table Properties"
 msgstr "Taulukon ominaisuudet"
 
@@ -14371,11 +14543,11 @@ msgstr "päivä"
 msgid "Autogenerated"
 msgstr "Automaattisesti luotu"
 
-#: ../src/e-util/e-mail-signature-editor.c:311 ../src/mail/e-mail-notes.c:954
+#: ../src/e-util/e-mail-signature-editor.c:311 ../src/mail/e-mail-notes.c:966
 msgid "Close"
 msgstr "Sulje"
 
-#: ../src/e-util/e-mail-signature-editor.c:316 ../src/mail/e-mail-notes.c:959
+#: ../src/e-util/e-mail-signature-editor.c:316 ../src/mail/e-mail-notes.c:971
 msgid "_Save and Close"
 msgstr "_Tallenna ja sulje"
 
@@ -14433,40 +14605,40 @@ msgstr ""
 "Hiirikäyttöinen maailmankartta aikavyöhykkeen valintaa varten. Näppäimistön "
 "käyttäjät voivat valita aikavyöhykkeen alla olevasta pudotusvalikosta."
 
-#: ../src/e-util/e-misc-utils.c:260
+#: ../src/e-util/e-misc-utils.c:262
 msgid "Could not open the link."
 msgstr "Linkkiä ei voitu avata."
 
-#: ../src/e-util/e-misc-utils.c:343
+#: ../src/e-util/e-misc-utils.c:346
 msgid "Could not display help for Evolution."
 msgstr "Evolutionin ohjetta ei voitu näyttää."
 
-#: ../src/e-util/e-misc-utils.c:2508
+#: ../src/e-util/e-misc-utils.c:2547
 #, c-format
 msgid "Opening calendar “%s”"
 msgstr "Avataan kalenteria “%s”"
 
-#: ../src/e-util/e-misc-utils.c:2511
+#: ../src/e-util/e-misc-utils.c:2550
 #, c-format
 msgid "Opening memo list “%s”"
 msgstr "Avataan muistilappuluetteloa “%s”"
 
-#: ../src/e-util/e-misc-utils.c:2514
+#: ../src/e-util/e-misc-utils.c:2553
 #, c-format
 msgid "Opening task list “%s”"
 msgstr "Avataan tehtävälistaa “%s”"
 
-#: ../src/e-util/e-misc-utils.c:2517
+#: ../src/e-util/e-misc-utils.c:2556
 #, c-format
 msgid "Opening address book “%s”"
 msgstr "Avataan osoitekirja “%s”"
 
-#: ../src/e-util/e-misc-utils.c:3297
+#: ../src/e-util/e-misc-utils.c:3336
 #: ../src/modules/mailto-handler/evolution-mailto-handler.c:146
 msgid "_Do not show this message again"
 msgstr "Älä _näytä tätä viestiä uudestaan"
 
-#: ../src/e-util/e-misc-utils.c:4123
+#: ../src/e-util/e-misc-utils.c:4189
 msgid ""
 "This address book server might be unreachable or the server name may be misspelled "
 "or your network connection could be down."
@@ -14474,18 +14646,18 @@ msgstr ""
 "Tämä osoitekirjapalvelin voi olla saavuttamattomissa, palvelimen nimi väärin "
 "kirjoitettu tai verkkoyhteytesi ei ehkä ole käytettävissä."
 
-#: ../src/e-util/e-misc-utils.c:4135
+#: ../src/e-util/e-misc-utils.c:4201
 #, c-format
 msgid "Failed to set protocol version to LDAPv3 (%d): %s"
 msgstr ""
 
-#: ../src/e-util/e-misc-utils.c:4147
+#: ../src/e-util/e-misc-utils.c:4213
 #, fuzzy, c-format
 #| msgid "Failed to authenticate with LDAP server."
 msgid "Failed to authenticate with LDAP server (%d): %s"
 msgstr "LDAP-palvelimelle tunnistautuminen epäonnistui."
 
-#: ../src/e-util/e-misc-utils.c:4161
+#: ../src/e-util/e-misc-utils.c:4227
 #, fuzzy, c-format
 #| msgid ""
 #| "This LDAP server may use an older version of LDAP, which does not support this "
@@ -14502,7 +14674,7 @@ msgstr ""
 "toimintoa, tai palvelin voi olla väärin konfiguroitu. Kysy ylläpidoltasi mitkä "
 "ovat tuetut hakupohjat."
 
-#: ../src/e-util/e-misc-utils.c:4172
+#: ../src/e-util/e-misc-utils.c:4238
 msgid ""
 "This LDAP server may use an older version of LDAP, which does not support this "
 "functionality or it may be misconfigured. Ask your administrator for supported "
@@ -14512,9 +14684,24 @@ msgstr ""
 "toimintoa, tai palvelin voi olla väärin konfiguroitu. Kysy ylläpidoltasi mitkä "
 "ovat tuetut hakupohjat."
 
-#: ../src/e-util/e-misc-utils.c:4205
+#: ../src/e-util/e-misc-utils.c:4271
 msgid "Evolution had not been compiled with LDAP support"
-msgstr ""
+msgstr "Evolutionia ei ole koostettu LDAP-tuen kera"
+
+#. Translators: %s is the language ISO code.
+#: ../src/e-util/e-misc-utils.c:4585
+#, c-format
+msgctxt "language"
+msgid "Unknown (%s)"
+msgstr "Tuntematon (%s)"
+
+#. Translators: The first %s is the language name, and the
+#. * second is the country name. Example: "French (France)"
+#: ../src/e-util/e-misc-utils.c:4594
+#, c-format
+msgctxt "language"
+msgid "%s (%s)"
+msgstr "%s (%s)"
 
 #: ../src/e-util/e-name-selector-dialog.c:274
 msgid "Show Contacts"
@@ -14740,21 +14927,10 @@ msgstr "Et_si:"
 msgid "Clear the search"
 msgstr "Tyhjennä hakukenttä"
 
-#: ../src/e-util/e-search-bar.c:655
-#: ../src/modules/accounts-window/e-collection-wizard-page.c:73
-msgid "_Previous"
-msgstr "_Edellinen"
-
 #: ../src/e-util/e-search-bar.c:658
 msgid "Find the previous occurrence of the phrase"
 msgstr "Etsi lauseen edellinen esiintymä"
 
-#: ../src/e-util/e-search-bar.c:667
-#: ../src/modules/accounts-window/e-collection-wizard-page.c:80
-#: ../src/modules/accounts-window/e-collection-wizard-page.c:224
-msgid "_Next"
-msgstr "_Seuraava"
-
 #: ../src/e-util/e-search-bar.c:670
 msgid "Find the next occurrence of the phrase"
 msgstr "Etsi lauseen seuraava esiintymä"
@@ -14938,17 +15114,17 @@ msgstr "Nimi ei voi olla tyhjä"
 msgid "Refresh every"
 msgstr "Päivitysväli"
 
-#: ../src/e-util/e-source-config.c:1446 ../src/e-util/e-source-config.c:1516
+#: ../src/e-util/e-source-config.c:1446 ../src/e-util/e-source-config.c:1520
 msgid "Use a secure connection"
 msgstr "Käytä salattua yhteyttä"
 
-#: ../src/e-util/e-source-config.c:1542
+#: ../src/e-util/e-source-config.c:1547
 #, fuzzy
 #| msgid "Imported Certificate"
 msgid "Unset _trust for SSL/TLS certificate"
 msgstr "Tuotu varmenne"
 
-#: ../src/e-util/e-source-config.c:1578
+#: ../src/e-util/e-source-config.c:1583
 msgid "User:"
 msgstr "Käyttäjä:"
 
@@ -14960,7 +15136,7 @@ msgstr "Näytä"
 msgid "Group name"
 msgstr "Ryhmän nimi"
 
-#: ../src/e-util/e-source-selector.c:3379 ../src/mail/e-mail-display.c:793
+#: ../src/e-util/e-source-selector.c:3379 ../src/mail/e-mail-display.c:805
 msgid "_Hide"
 msgstr "_Piilota"
 
@@ -14984,21 +15160,6 @@ msgstr "_Kohde"
 msgid "Select destination"
 msgstr "Valitse kohde"
 
-#. Translators: %s is the language ISO code.
-#: ../src/e-util/e-spell-dictionary.c:265
-#, c-format
-msgctxt "language"
-msgid "Unknown (%s)"
-msgstr "Tuntematon (%s)"
-
-#. Translators: The first %s is the language name, and the
-#. * second is the country name. Example: "French (France)"
-#: ../src/e-util/e-spell-dictionary.c:280 ../src/e-util/e-spell-dictionary.c:285
-#, c-format
-msgctxt "language"
-msgid "%s (%s)"
-msgstr "%s (%s)"
-
 #. no suggestions. Put something in the menu anyway...
 #: ../src/e-util/e-spell-entry.c:479
 msgid "(no suggestions)"
@@ -15169,7 +15330,7 @@ msgstr ""
 msgid "Failed to refresh list of account sources"
 msgstr ""
 
-#: ../src/e-util/e-table-click-to-add.c:687
+#: ../src/e-util/e-table-click-to-add.c:688
 #: ../src/e-util/gal-a11y-e-table-click-to-add.c:59
 #: ../src/e-util/gal-a11y-e-table-click-to-add.c:140
 msgid "click to add"
@@ -15389,11 +15550,11 @@ msgstr "_Järjestystapa"
 msgid "_Custom"
 msgstr "_Oma"
 
-#: ../src/e-util/e-text.c:2100
+#: ../src/e-util/e-text.c:2105
 msgid "Select All"
 msgstr "Valitse kaikki"
 
-#: ../src/e-util/e-text.c:2113
+#: ../src/e-util/e-text.c:2118
 msgid "Input Methods"
 msgstr "Syötemenetelmät"
 
@@ -15589,98 +15750,109 @@ msgstr "_Luo kalenteri"
 msgid "Create Collectio_n"
 msgstr "Luo _kokoelma"
 
-#: ../src/e-util/e-web-view.c:348
+#: ../src/e-util/e-web-view.c:406
 msgid "_Copy Link Location"
 msgstr "_Kopioi linkin sijainti"
 
-#: ../src/e-util/e-web-view.c:350
+#: ../src/e-util/e-web-view.c:408
 msgid "Copy the link to the clipboard"
 msgstr "Kopioi linkki leikepöydälle"
 
-#: ../src/e-util/e-web-view.c:358
+#: ../src/e-util/e-web-view.c:416
 msgid "_Open Link in Browser"
 msgstr "_Avaa linkki selaimessa"
 
-#: ../src/e-util/e-web-view.c:360
+#: ../src/e-util/e-web-view.c:418
 msgid "Open the link in a web browser"
 msgstr "Avaa linkki selaimessa"
 
-#: ../src/e-util/e-web-view.c:368
+#: ../src/e-util/e-web-view.c:426
 msgid "_Copy Email Address"
 msgstr "_Kopioi sähköpostiosoite"
 
-#: ../src/e-util/e-web-view.c:375
+#: ../src/e-util/e-web-view.c:433
 #, fuzzy
 #| msgid "Copy _Email Address"
 msgid "Copy _Raw Email Address"
 msgstr "Kopioi _sähköpostiosoite"
 
-#: ../src/e-util/e-web-view.c:377
+#: ../src/e-util/e-web-view.c:435
 #, fuzzy
 #| msgid "Copy the email address to the clipboard"
 msgid "Copy the raw email address to the clipboard"
 msgstr "Kopioi sähköpostiosoite leikepöydälle"
 
-#: ../src/e-util/e-web-view.c:392
+#: ../src/e-util/e-web-view.c:450
 msgid "_Copy Image"
 msgstr "K_opioi kuva"
 
-#: ../src/e-util/e-web-view.c:394
+#: ../src/e-util/e-web-view.c:452
 msgid "Copy the image to the clipboard"
 msgstr "Kopioi kuva leikepöydälle"
 
-#: ../src/e-util/e-web-view.c:399
+#: ../src/e-util/e-web-view.c:457
 msgid "Save _Image..."
 msgstr "Tal_lenna kuva..."
 
-#: ../src/e-util/e-web-view.c:401
+#: ../src/e-util/e-web-view.c:459
 msgid "Save the image to a file"
 msgstr "Tallenna kuva tiedostoon"
 
-#: ../src/e-util/e-web-view.c:421 ../src/e-util/e-web-view.c:2032
+#: ../src/e-util/e-web-view.c:474 ../src/mail/e-mail-reader.c:2787
+#| msgid "Searches"
+msgid "Search _Web…"
+msgstr "Etsi _verkosta…"
+
+#: ../src/e-util/e-web-view.c:476 ../src/mail/e-mail-reader.c:2789
+#, fuzzy
+#| msgid "Send a message to the selected contacts"
+msgid "Search the Web with the selected text"
+msgstr "Lähetä viesti valituille henkilöille"
+
+#: ../src/e-util/e-web-view.c:486 ../src/e-util/e-web-view.c:2097
 msgid "Select all text and images"
 msgstr "Valitse kaikki teksti ja kuvat"
 
-#: ../src/e-util/e-web-view.c:1381
+#: ../src/e-util/e-web-view.c:1446
 #, c-format
 msgid "Click to call %s"
 msgstr "Soita numeroon %s napsauttamalla"
 
-#: ../src/e-util/e-web-view.c:1383
+#: ../src/e-util/e-web-view.c:1448
 msgid "Click to hide/unhide addresses"
 msgstr "Napsauta piilottaaksesi tai näyttääksesi osoitteet"
 
-#: ../src/e-util/e-web-view.c:1394
+#: ../src/e-util/e-web-view.c:1459
 #, fuzzy, c-format
 #| msgid "Enter the recipients of the message"
 msgid "Go to the section %s of the message"
 msgstr "Syötä viestin vastaanottajat"
 
-#: ../src/e-util/e-web-view.c:1396
+#: ../src/e-util/e-web-view.c:1461
 #, fuzzy
 #| msgid "Enter the recipients of the message"
 msgid "Go to the beginning of the message"
 msgstr "Syötä viestin vastaanottajat"
 
-#: ../src/e-util/e-web-view.c:1400
+#: ../src/e-util/e-web-view.c:1465
 #, c-format
 msgid "Click to open %s"
 msgstr "Napsauta avataksesi %s"
 
-#: ../src/e-util/e-web-view.c:3953
+#: ../src/e-util/e-web-view.c:4128
 msgid "Copying image to clipboard"
 msgstr "Kopioidaan kuva leikepöydälle"
 
-#: ../src/e-util/e-web-view.c:4141
+#: ../src/e-util/e-web-view.c:4316
 msgid "Save Image"
 msgstr "Tallenna kuva"
 
-#: ../src/e-util/e-web-view.c:4182
+#: ../src/e-util/e-web-view.c:4353
 #, c-format
 msgid "Saving image to “%s”"
 msgstr "Tallennetaan kuva kohteeseen “%s”"
 
-#: ../src/e-util/e-web-view.c:4277
+#: ../src/e-util/e-web-view.c:4500
 #, c-format
 msgid "Cannot get URI “%s”, do not know how to download it."
 msgstr ""
@@ -15783,7 +15955,7 @@ msgstr "määrittelemäsi aika"
 msgid "a time relative to the current time"
 msgstr "Aika suhteessa tämänhetkiseen aikaan"
 
-#: ../src/e-util/filter.ui.h:5 ../src/mail/mail-config.ui.h:93
+#: ../src/e-util/filter.ui.h:5 ../src/mail/mail-config.ui.h:95
 msgid "seconds"
 msgstr "sekuntia"
 
@@ -15853,7 +16025,7 @@ msgstr ""
 msgid "Show filters for mail:"
 msgstr "Sähköpostin näytön suodattimet:"
 
-#: ../src/e-util/filter.ui.h:22 ../src/mail/em-filter-editor.c:163
+#: ../src/e-util/filter.ui.h:22 ../src/mail/em-filter-editor.c:401
 msgid "_Filter Rules"
 msgstr "_Suodatinsäännöt"
 
@@ -15894,7 +16066,7 @@ msgstr "piilota tämän solun sisältävä ETreen rivi"
 msgid "click"
 msgstr "napsauta"
 
-#: ../src/e-util/gal-a11y-e-table-column-header.c:160
+#: ../src/e-util/gal-a11y-e-table-column-header.c:161
 msgid "sort"
 msgstr "järjestä"
 
@@ -15910,7 +16082,7 @@ msgstr "Luo uusi _näkymä"
 msgid "_Replace existing view"
 msgstr "_Korvaa olemassaoleva näkymä"
 
-#: ../src/e-util/widgets.error.xml.h:1 ../src/mail/mail.error.xml.h:203
+#: ../src/e-util/widgets.error.xml.h:1 ../src/mail/mail.error.xml.h:204
 msgid "Do you wish to save your changes?"
 msgstr "Haluatko tallentaa muutokset?"
 
@@ -15918,7 +16090,7 @@ msgstr "Haluatko tallentaa muutokset?"
 msgid "This signature has been changed, but has not been saved."
 msgstr "Tämä allekirjoitus on muuttunut, mutta sitä ei ole tallennettu."
 
-#: ../src/e-util/widgets.error.xml.h:3 ../src/mail/mail.error.xml.h:205
+#: ../src/e-util/widgets.error.xml.h:3 ../src/mail/mail.error.xml.h:206
 msgid "_Discard changes"
 msgstr "_Hylkää muutokset"
 
@@ -15946,6 +16118,12 @@ msgstr "Allekirjoitusta ei voi ladata."
 msgid "Could not save signature."
 msgstr "Allekirjoitusta ei voi tallentaa."
 
+#: ../src/e-util/widgets.error.xml.h:10
+#, fuzzy
+#| msgid "Could not get a selection to delete."
+msgid "Could not get selected text."
+msgstr "Valintaa ei voitu hakea poistettavaksi."
+
 #: ../src/libemail-engine/e-mail-folder-utils.c:106
 #, c-format
 msgid "Saving message to folder “%s”"
@@ -15999,31 +16177,31 @@ msgstr "Virheellinen kansio: ”%s”"
 
 #. Some local folders
 #: ../src/libemail-engine/e-mail-session.c:117
-#: ../src/mail/em-folder-properties.c:1143 ../src/mail/em-folder-tree-model.c:1237
+#: ../src/mail/em-folder-properties.c:1164 ../src/mail/em-folder-tree-model.c:1237
 #: ../src/mail/importers/kmail-libs.c:139
-#: ../src/modules/mail/e-mail-shell-view-private.c:1003
-#: ../src/modules/mail/e-mail-shell-view-private.c:1014
+#: ../src/modules/mail/e-mail-shell-view-private.c:1032
+#: ../src/modules/mail/e-mail-shell-view-private.c:1043
 msgid "Inbox"
 msgstr "Saapuneet"
 
 #. E_MAIL_LOCAL_FOLDER_INBOX
 #: ../src/libemail-engine/e-mail-session.c:118
 #: ../src/mail/em-folder-tree-model.c:1230 ../src/mail/importers/kmail-libs.c:145
-#: ../src/modules/mail/e-mail-shell-view-private.c:1001
+#: ../src/modules/mail/e-mail-shell-view-private.c:1030
 msgid "Drafts"
 msgstr "Luonnokset"
 
 #. E_MAIL_LOCAL_FOLDER_DRAFTS
 #: ../src/libemail-engine/e-mail-session.c:119
 #: ../src/mail/em-folder-tree-model.c:1241 ../src/mail/importers/kmail-libs.c:141
-#: ../src/modules/mail/e-mail-shell-view-private.c:1005
+#: ../src/modules/mail/e-mail-shell-view-private.c:1034
 msgid "Outbox"
 msgstr "Lähtevät"
 
 #. E_MAIL_LOCAL_FOLDER_OUTBOX
 #: ../src/libemail-engine/e-mail-session.c:120
 #: ../src/mail/em-folder-tree-model.c:1245 ../src/mail/importers/kmail-libs.c:143
-#: ../src/modules/mail/e-mail-shell-view-private.c:1007
+#: ../src/modules/mail/e-mail-shell-view-private.c:1036
 msgid "Sent"
 msgstr "Lähetetyt"
 
@@ -16031,7 +16209,7 @@ msgstr "Lähetetyt"
 #: ../src/libemail-engine/e-mail-session.c:121
 #: ../src/mail/e-mail-templates-store.c:2211 ../src/mail/em-folder-tree-model.c:1233
 #: ../src/mail/importers/kmail-libs.c:147
-#: ../src/modules/mail/e-mail-shell-view-private.c:1009
+#: ../src/modules/mail/e-mail-shell-view-private.c:1038
 #: ../src/plugins/templates/org-gnome-templates.eplug.xml.h:1
 msgid "Templates"
 msgstr "Pohjat"
@@ -16068,7 +16246,7 @@ msgstr ""
 msgid "Looking up recipient PGP keys in address books…"
 msgstr ""
 
-#: ../src/libemail-engine/e-mail-session.c:2641
+#: ../src/libemail-engine/e-mail-session.c:2639
 #, fuzzy, c-format
 #| msgid "Storing folder '%s'"
 msgid "Waiting for “%s”"
@@ -16121,9 +16299,9 @@ msgstr ""
 msgid "Failed to append to local “Sent” folder: %s"
 msgstr "Paikalliseen ”Lähetetyt”-kansioon lisääminen epäonnistui: %s"
 
-#: ../src/libemail-engine/e-mail-session-utils.c:925
-#: ../src/libemail-engine/mail-ops.c:984 ../src/libemail-engine/mail-ops.c:1097
-#: ../src/mail/mail-send-recv.c:635
+#: ../src/libemail-engine/e-mail-session-utils.c:929
+#: ../src/libemail-engine/mail-ops.c:1019 ../src/libemail-engine/mail-ops.c:1134
+#: ../src/mail/mail-send-recv.c:665
 msgid "Sending message"
 msgstr "Lähetetään viestiä"
 
@@ -16139,7 +16317,7 @@ msgstr "Katkaistaan yhteys kohteeseen ”%s”"
 msgid "Reconnecting to “%s”"
 msgstr "Yhdistetään uudelleen kohteeseen ”%s”"
 
-#: ../src/libemail-engine/e-mail-store-utils.c:349
+#: ../src/libemail-engine/e-mail-store-utils.c:349 ../src/mail/mail-send-recv.c:1089
 #, fuzzy, c-format
 #| msgid "Preparing account '%s' for offline"
 msgid "Preparing account “%s” for offline"
@@ -16173,7 +16351,7 @@ msgid ""
 "Original error was: %s"
 msgstr ""
 
-#: ../src/libemail-engine/mail-ops.c:995
+#: ../src/libemail-engine/mail-ops.c:1030
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Lähetetään viestiä %d / %d"
@@ -16181,58 +16359,58 @@ msgstr "Lähetetään viestiä %d / %d"
 #. Translators: The string is distinguished by total
 #. * count of messages to be sent.  Failed messages is
 #. * always more than zero.
-#: ../src/libemail-engine/mail-ops.c:1053
+#: ../src/libemail-engine/mail-ops.c:1088
 #, c-format
 msgid "Failed to send a message"
 msgid_plural "Failed to send %d of %d messages"
 msgstr[0] "Viestin lähetys epäonnistui"
 msgstr[1] "%d viestin %d:stä lähetys epäonnistui"
 
-#: ../src/libemail-engine/mail-ops.c:1059
+#: ../src/libemail-engine/mail-ops.c:1094
 msgid "Cancelled."
 msgstr "Peruttu."
 
-#: ../src/libemail-engine/mail-ops.c:1061
+#: ../src/libemail-engine/mail-ops.c:1096
 msgid "Complete."
 msgstr "Valmis."
 
-#: ../src/libemail-engine/mail-ops.c:1183
+#: ../src/libemail-engine/mail-ops.c:1220
 #, fuzzy, c-format
 #| msgid "Moving messages to '%s'"
 msgid "Moving messages to “%s”"
 msgstr "Siirretään viestejä kansioon ”%s”"
 
-#: ../src/libemail-engine/mail-ops.c:1184
+#: ../src/libemail-engine/mail-ops.c:1221
 #, fuzzy, c-format
 #| msgid "Copying messages to '%s'"
 msgid "Copying messages to “%s”"
 msgstr "Kopioidaan viestejä kansioon ”%s”"
 
-#: ../src/libemail-engine/mail-ops.c:1303
+#: ../src/libemail-engine/mail-ops.c:1340
 #, fuzzy, c-format
 #| msgid "Storing folder '%s'"
 msgid "Storing folder “%s”"
 msgstr "Tallennetaan kansiota %s"
 
-#: ../src/libemail-engine/mail-ops.c:1431
+#: ../src/libemail-engine/mail-ops.c:1468
 #, fuzzy, c-format
 #| msgid "Expunging and storing account '%s'"
 msgid "Expunging and storing account “%s”"
 msgstr "Siivotaan ja tallennetaan tiliä ”%s”"
 
-#: ../src/libemail-engine/mail-ops.c:1432
+#: ../src/libemail-engine/mail-ops.c:1469
 #, fuzzy, c-format
 #| msgid "Storing account '%s'"
 msgid "Storing account “%s”"
 msgstr "Tallennetaan tiliä ”%s”"
 
-#: ../src/libemail-engine/mail-ops.c:1507
+#: ../src/libemail-engine/mail-ops.c:1544
 #, fuzzy, c-format
 #| msgid "Emptying trash in '%s'"
 msgid "Emptying trash in “%s”"
 msgstr "Tyhjennetään roskakoria ”%s”"
 
-#: ../src/libemail-engine/mail-ops.c:1599
+#: ../src/libemail-engine/mail-ops.c:1636
 #, fuzzy, c-format
 #| msgid "Storing folder '%s'"
 msgid "Processing folder changes in “%s”"
@@ -16336,67 +16514,67 @@ msgstr "_Oletustili"
 msgid "Invalid URI: “%s”"
 msgstr "Virheellinen URI: “%s”"
 
-#: ../src/mail/e-mail-autoconfig.c:731
+#: ../src/mail/e-mail-autoconfig.c:753
 #, c-format
 msgid "Host: %s:%d"
 msgstr ""
 
-#: ../src/mail/e-mail-autoconfig.c:735
+#: ../src/mail/e-mail-autoconfig.c:757
 #, c-format
 msgid "User: %s"
 msgstr "Käyttäjä: %s"
 
-#: ../src/mail/e-mail-autoconfig.c:739
+#: ../src/mail/e-mail-autoconfig.c:761
 #, fuzzy, c-format
 #| msgid "Security:"
 msgid "Security method: %s"
 msgstr "Salaus:"
 
-#: ../src/mail/e-mail-autoconfig.c:740 ../src/mail/e-mail-config-summary-page.c:144
+#: ../src/mail/e-mail-autoconfig.c:762 ../src/mail/e-mail-config-summary-page.c:144
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/mail/e-mail-autoconfig.c:741 ../src/mail/e-mail-config-summary-page.c:147
+#: ../src/mail/e-mail-autoconfig.c:763 ../src/mail/e-mail-config-summary-page.c:147
 msgid "STARTTLS"
 msgstr "STARTTLS"
 
-#: ../src/mail/e-mail-autoconfig.c:745
+#: ../src/mail/e-mail-autoconfig.c:767
 #, c-format
 msgid "Authentication mechanism: %s"
 msgstr "Tunnistautumismekanismi: %s"
 
-#: ../src/mail/e-mail-autoconfig.c:904
+#: ../src/mail/e-mail-autoconfig.c:926
 msgid "No email address provided"
 msgstr "Sähköpostiosoitetta ei annettu."
 
-#: ../src/mail/e-mail-autoconfig.c:913
+#: ../src/mail/e-mail-autoconfig.c:935
 msgid "Missing domain in email address"
 msgstr "Verkkonimi puuttuu sähköpostiosoitteesta"
 
-#: ../src/mail/e-mail-autoconfig.c:1252
+#: ../src/mail/e-mail-autoconfig.c:1277
 #: ../src/modules/config-lookup/e-srv-config-lookup.c:82
 #: ../src/modules/config-lookup/e-srv-config-lookup.c:83
 msgid "IMAP server"
 msgstr "IMAP-palvelin"
 
-#: ../src/mail/e-mail-autoconfig.c:1259
+#: ../src/mail/e-mail-autoconfig.c:1284
 #: ../src/modules/config-lookup/e-srv-config-lookup.c:84
 #: ../src/modules/config-lookup/e-srv-config-lookup.c:85
 msgid "POP3 server"
 msgstr "POP3-palvelin"
 
-#: ../src/mail/e-mail-autoconfig.c:1266
+#: ../src/mail/e-mail-autoconfig.c:1291
 #: ../src/modules/config-lookup/e-srv-config-lookup.c:86
 msgid "SMTP server"
 msgstr "SMTP-palvelin"
 
-#: ../src/mail/e-mail-browser.c:133 ../src/shell/e-shell-window-actions.c:796
-#: ../src/shell/e-shell-window-actions.c:803
-#: ../src/shell/e-shell-window-actions.c:810
+#: ../src/mail/e-mail-browser.c:133 ../src/shell/e-shell-window-actions.c:819
+#: ../src/shell/e-shell-window-actions.c:826
+#: ../src/shell/e-shell-window-actions.c:833
 msgid "Close this window"
 msgstr "Sulje tämä ikkuna"
 
-#: ../src/mail/e-mail-browser.c:291
+#: ../src/mail/e-mail-browser.c:294
 msgid "(No Subject)"
 msgstr "(Ei aihetta)"
 
@@ -16426,82 +16604,97 @@ msgstr "Kysellään tunnistautumistyyppejä..."
 msgid "Check for Supported Types"
 msgstr "Tarkista tuetut tyypit"
 
-#: ../src/mail/e-mail-config-composing-page.c:116
+#: ../src/mail/e-mail-config-composing-page.c:117
 #, fuzzy
 #| msgid "Use locale default"
 msgctxt "ReplyForward"
 msgid "Use global setting"
 msgstr "Käytä oletusaikavyöhykettä"
 
-#: ../src/mail/e-mail-config-composing-page.c:118 ../src/mail/mail-config.ui.h:27
+#: ../src/mail/e-mail-config-composing-page.c:119 ../src/mail/mail-config.ui.h:29
 msgctxt "ReplyForward"
 msgid "Attachment"
 msgstr "Liite"
 
-#: ../src/mail/e-mail-config-composing-page.c:120 ../src/mail/mail-config.ui.h:28
+#: ../src/mail/e-mail-config-composing-page.c:121 ../src/mail/mail-config.ui.h:30
 msgctxt "ReplyForward"
 msgid "Inline (Outlook style)"
 msgstr "Sisennetty (Outlookin tapaan)"
 
-#: ../src/mail/e-mail-config-composing-page.c:122 ../src/mail/mail-config.ui.h:29
+#: ../src/mail/e-mail-config-composing-page.c:123 ../src/mail/mail-config.ui.h:31
 msgctxt "ReplyForward"
 msgid "Quoted"
 msgstr "Lainattu"
 
-#: ../src/mail/e-mail-config-composing-page.c:124 ../src/mail/mail-config.ui.h:30
+#: ../src/mail/e-mail-config-composing-page.c:125 ../src/mail/mail-config.ui.h:32
 msgctxt "ReplyForward"
 msgid "Do Not Quote"
 msgstr "Älä lainaa"
 
-#: ../src/mail/e-mail-config-composing-page.c:397
-#: ../src/mail/e-mail-config-composing-page.c:606
+#: ../src/mail/e-mail-config-composing-page.c:157
+#, fuzzy
+#| msgid "Use locale default"
+msgid "Use global setting"
+msgstr "Käytä oletusaikavyöhykettä"
+
+#: ../src/mail/e-mail-config-composing-page.c:408
+#: ../src/mail/e-mail-config-composing-page.c:642
 msgid "Composing Messages"
 msgstr "Viestien kirjoittaminen"
 
-#: ../src/mail/e-mail-config-composing-page.c:406
+#: ../src/mail/e-mail-config-composing-page.c:417
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "_Lähetä aina kopio (Cc) osoitteeseen:"
 
-#: ../src/mail/e-mail-config-composing-page.c:431
+#: ../src/mail/e-mail-config-composing-page.c:442
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Lähetä aina _piilotettu kopio (Bcc) osoitteeseen:"
 
-#: ../src/mail/e-mail-config-composing-page.c:462
+#: ../src/mail/e-mail-config-composing-page.c:467
 #, fuzzy
 #| msgid "_Reply style:"
 msgid "Re_ply style:"
 msgstr "_Vastaustyyli:"
 
-#: ../src/mail/e-mail-config-composing-page.c:488
-#: ../src/mail/em-composer-utils.c:4058 ../src/mail/mail-config.ui.h:20
+#: ../src/mail/e-mail-config-composing-page.c:495
+msgid "Lang_uage:"
+msgstr "Kiel_i:"
+
+#: ../src/mail/e-mail-config-composing-page.c:498
+#: ../src/mail/e-mail-config-composing-page.c:508 ../src/mail/mail-config.ui.h:21
+msgid "Language for Reply and Forward attribution text"
+msgstr ""
+
+#: ../src/mail/e-mail-config-composing-page.c:524
+#: ../src/mail/em-composer-utils.c:4273 ../src/mail/mail-config.ui.h:22
 #, fuzzy
 #| msgid "Start _typing at the bottom on replying"
 msgid "Start _typing at the bottom"
 msgstr "Aloita _kirjoittaminen lopusta vastattaessa"
 
-#: ../src/mail/e-mail-config-composing-page.c:495 ../src/mail/mail-config.ui.h:21
+#: ../src/mail/e-mail-config-composing-page.c:531 ../src/mail/mail-config.ui.h:23
 #, fuzzy
 #| msgid "_Keep signature above the original message on replying"
 msgid "_Keep signature above the original message"
 msgstr "_Pidä allekirjoitus alkuperäisen viestin yllä vastattaessa"
 
-#: ../src/mail/e-mail-config-composing-page.c:512
+#: ../src/mail/e-mail-config-composing-page.c:548
 msgid "Message Receipts"
 msgstr "Viestin kuittaukset"
 
-#: ../src/mail/e-mail-config-composing-page.c:521
+#: ../src/mail/e-mail-config-composing-page.c:557
 msgid "S_end message receipts:"
 msgstr "Läh_etä viestin kuittaus:"
 
-#: ../src/mail/e-mail-config-composing-page.c:546
+#: ../src/mail/e-mail-config-composing-page.c:582
 msgid "Never"
 msgstr "Ei koskaan"
 
-#: ../src/mail/e-mail-config-composing-page.c:552
+#: ../src/mail/e-mail-config-composing-page.c:588
 msgid "Always"
 msgstr "Aina"
 
-#: ../src/mail/e-mail-config-composing-page.c:558
+#: ../src/mail/e-mail-config-composing-page.c:594
 msgid "Ask for each message"
 msgstr "Kysy jokaisen viestin osalta"
 
@@ -16600,7 +16793,7 @@ msgstr ""
 msgid "Choose a folder for junk messages."
 msgstr "Valitse kansio johon viesti postitetaan:"
 
-#: ../src/mail/e-mail-config-defaults-page.c:981
+#: ../src/mail/e-mail-config-defaults-page.c:995
 msgid "Defaults"
 msgstr "Oletusasetukset"
 
@@ -16720,11 +16913,11 @@ msgid "%s — %s"
 msgstr "%s — %s"
 
 #: ../src/mail/e-mail-config-security-page.c:460
-#: ../src/mail/em-folder-properties.c:1062 ../src/mail/mail-config.ui.h:32
+#: ../src/mail/em-folder-properties.c:1083 ../src/mail/mail-config.ui.h:34
 #: ../src/modules/addressbook/autocompletion-config.c:115
 #: ../src/modules/calendar/e-calendar-preferences.c:643
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:48
-#: ../src/modules/mail/e-mail-shell-backend.c:754
+#: ../src/modules/mail/e-mail-shell-backend.c:771
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:17
 msgid "General"
 msgstr "Yleiset"
@@ -16746,22 +16939,22 @@ msgid "Si_gning algorithm:"
 msgstr "_Allekirjoitusalgoritmi:"
 
 #: ../src/mail/e-mail-config-security-page.c:547
-#: ../src/mail/e-mail-config-security-page.c:711 ../src/mail/mail-config.ui.h:77
+#: ../src/mail/e-mail-config-security-page.c:711 ../src/mail/mail-config.ui.h:79
 msgid "SHA1"
 msgstr "SHA1"
 
 #: ../src/mail/e-mail-config-security-page.c:550
-#: ../src/mail/e-mail-config-security-page.c:714 ../src/mail/mail-config.ui.h:78
+#: ../src/mail/e-mail-config-security-page.c:714 ../src/mail/mail-config.ui.h:80
 msgid "SHA256"
 msgstr "SHA256"
 
 #: ../src/mail/e-mail-config-security-page.c:553
-#: ../src/mail/e-mail-config-security-page.c:717 ../src/mail/mail-config.ui.h:79
+#: ../src/mail/e-mail-config-security-page.c:717 ../src/mail/mail-config.ui.h:81
 msgid "SHA384"
 msgstr "SHA384"
 
 #: ../src/mail/e-mail-config-security-page.c:556
-#: ../src/mail/e-mail-config-security-page.c:720 ../src/mail/mail-config.ui.h:80
+#: ../src/mail/e-mail-config-security-page.c:720 ../src/mail/mail-config.ui.h:82
 msgid "SHA512"
 msgstr "SHA512"
 
@@ -16800,7 +16993,7 @@ msgstr "Valitse"
 
 #: ../src/mail/e-mail-config-security-page.c:686
 #: ../src/mail/e-mail-config-security-page.c:784
-#: ../src/shell/e-shell-window-actions.c:892
+#: ../src/shell/e-shell-window-actions.c:915
 msgid "_Clear"
 msgstr "_Tyhjennä"
 
@@ -16896,7 +17089,7 @@ msgstr ""
 "Aloita napsauttamalla “Jatka”."
 
 #: ../src/mail/e-mail-config-welcome-page.c:171
-#: ../src/modules/startup-wizard/e-startup-assistant.c:154
+#: ../src/modules/startup-wizard/e-startup-assistant.c:182
 msgid "Welcome"
 msgstr "Tervetuloa"
 
@@ -16928,33 +17121,33 @@ msgstr "Lähetä vastausviesti tähän osoitteeseen"
 msgid "Create Search _Folder"
 msgstr "Luo _hakunäkymä"
 
-#: ../src/mail/e-mail-display.c:800
+#: ../src/mail/e-mail-display.c:812
 msgid "Hid_e All"
 msgstr "_Piilota kaikki"
 
-#: ../src/mail/e-mail-display.c:807
+#: ../src/mail/e-mail-display.c:819
 msgid "_View Inline"
 msgstr "Näytä _sisäkkäisesti"
 
-#: ../src/mail/e-mail-display.c:814
+#: ../src/mail/e-mail-display.c:826
 msgid "Vie_w All Inline"
 msgstr "_Näytä kaikki sisäkkäisesti"
 
-#: ../src/mail/e-mail-display.c:821
+#: ../src/mail/e-mail-display.c:833
 msgid "_Zoom to 100%"
 msgstr "_Zoomaa kokoon 100 %"
 
-#: ../src/mail/e-mail-display.c:823
+#: ../src/mail/e-mail-display.c:835
 msgid "Zoom the image to its natural size"
 msgstr "Palauta kuva alkuperäiseen kokoon"
 
-#: ../src/mail/e-mail-display.c:828
+#: ../src/mail/e-mail-display.c:840
 #, fuzzy
 #| msgid "Close this window"
 msgid "_Zoom to window"
 msgstr "Sulje tämä ikkuna"
 
-#: ../src/mail/e-mail-display.c:830
+#: ../src/mail/e-mail-display.c:842
 msgid "Zoom large images to not be wider than the window width"
 msgstr ""
 
@@ -17055,11 +17248,11 @@ msgid "_Later"
 msgstr "_Myöhemmin"
 
 #: ../src/mail/e-mail-label-manager.c:169 ../src/mail/e-mail-reader.c:906
-#: ../src/mail/em-folder-properties.c:834
+#: ../src/mail/em-folder-properties.c:855
 msgid "Add Label"
 msgstr "Lisää merkintä"
 
-#: ../src/mail/e-mail-label-manager.c:220 ../src/mail/em-folder-properties.c:861
+#: ../src/mail/e-mail-label-manager.c:220 ../src/mail/em-folder-properties.c:882
 msgid "Edit Label"
 msgstr "Muokkaa merkintää"
 
@@ -17091,13 +17284,13 @@ msgstr "Kopioidaan viestejä kansioon %s"
 msgid "Storing changes..."
 msgstr "Tallennetaan muutoksia..."
 
-#: ../src/mail/e-mail-notes.c:989
+#: ../src/mail/e-mail-notes.c:1001
 #, fuzzy
 #| msgid "_Edit Message"
 msgid "Edit Message Note"
 msgstr "_Muokkaa viestiä"
 
-#: ../src/mail/e-mail-notes.c:1143
+#: ../src/mail/e-mail-notes.c:1159
 msgid "Retrieving message..."
 msgstr "Noudetaan viestiä..."
 
@@ -17137,7 +17330,7 @@ msgstr "Otsakkeen nimi"
 msgid "Header Value"
 msgstr "Otsakkeen arvo"
 
-#: ../src/mail/e-mail-printer.c:103 ../src/mail/mail-config.ui.h:130
+#: ../src/mail/e-mail-printer.c:103 ../src/mail/mail-config.ui.h:132
 msgid "Headers"
 msgstr "Otsakkeet"
 
@@ -17155,7 +17348,7 @@ msgid "Copy to Folder"
 msgstr "Kopioi kansioon"
 
 #: ../src/mail/e-mail-reader.c:362 ../src/mail/em-folder-utils.c:568
-#: ../src/mail/mail.error.xml.h:152
+#: ../src/mail/mail.error.xml.h:153
 msgid "_Move"
 msgstr "_Siirrä"
 
@@ -17180,663 +17373,663 @@ msgstr "_Älä koskaan huomioi postituslistojen Reply-To-otsaketta."
 msgid "Failed to retrieve message:"
 msgstr "Viestin nouto epäonnistui:"
 
-#: ../src/mail/e-mail-reader.c:2164 ../src/mail/e-mail-reader.c:3624
+#: ../src/mail/e-mail-reader.c:2164 ../src/mail/e-mail-reader.c:3641
 #, c-format
 msgid "Retrieving message “%s”"
 msgstr "Noudetaan viestiä “%s”"
 
-#: ../src/mail/e-mail-reader.c:2352
+#: ../src/mail/e-mail-reader.c:2365
 msgid "A_dd Sender to Address Book"
 msgstr "_Lisää lähettäjä osoitekirjaan"
 
-#: ../src/mail/e-mail-reader.c:2354
+#: ../src/mail/e-mail-reader.c:2367
 msgid "Add sender to address book"
 msgstr "Lisää lähettäjä osoitekirjaan"
 
-#: ../src/mail/e-mail-reader.c:2359
+#: ../src/mail/e-mail-reader.c:2372
 msgid "_Archive..."
 msgstr "_Arkistoi..."
 
-#: ../src/mail/e-mail-reader.c:2361
+#: ../src/mail/e-mail-reader.c:2374
 #, fuzzy
 #| msgid "Move selected messages to another folder"
 msgid "Move selected messages to the Archive folder for the account"
 msgstr "Siirrä valitut viestit toiseen kansioon"
 
-#: ../src/mail/e-mail-reader.c:2366
+#: ../src/mail/e-mail-reader.c:2379
 msgid "Check for _Junk"
 msgstr "Etsi _roskapostia"
 
-#: ../src/mail/e-mail-reader.c:2368
+#: ../src/mail/e-mail-reader.c:2381
 msgid "Filter the selected messages for junk status"
 msgstr "Suodata valitut viestit roskapostiksi"
 
-#: ../src/mail/e-mail-reader.c:2373
+#: ../src/mail/e-mail-reader.c:2386
 #, fuzzy
 #| msgid "Assign Color"
 msgid "Assign C_olor…"
 msgstr "Aseta väri"
 
-#: ../src/mail/e-mail-reader.c:2375
+#: ../src/mail/e-mail-reader.c:2388
 #, fuzzy
 #| msgid "Create a new memo from the selected message"
 msgid "Assign color for the selected messages"
 msgstr "Luo uusi muistilappu valitusta viestistä"
 
-#: ../src/mail/e-mail-reader.c:2380
+#: ../src/mail/e-mail-reader.c:2393
 #, fuzzy
 #| msgid "Unset Color"
 msgid "Unse_t Color"
 msgstr "Poista värin asetus"
 
-#: ../src/mail/e-mail-reader.c:2382
+#: ../src/mail/e-mail-reader.c:2395
 #, fuzzy
 #| msgid "Undelete the selected messages"
 msgid "Unset color for the selected messages"
 msgstr "Palauta valitut viestit"
 
-#: ../src/mail/e-mail-reader.c:2387
+#: ../src/mail/e-mail-reader.c:2400
 msgid "_Copy to Folder..."
 msgstr "_Kopioi kansioon..."
 
-#: ../src/mail/e-mail-reader.c:2389
+#: ../src/mail/e-mail-reader.c:2402
 msgid "Copy selected messages to another folder"
 msgstr "Kopioi valitut viestit uuteen kansioon"
 
-#: ../src/mail/e-mail-reader.c:2394
+#: ../src/mail/e-mail-reader.c:2407
 msgid "_Delete Message"
 msgstr "Poista _viesti"
 
-#: ../src/mail/e-mail-reader.c:2396
+#: ../src/mail/e-mail-reader.c:2409
 msgid "Mark the selected messages for deletion"
 msgstr "Merkitse valitut viestit poistettaviksi"
 
-#: ../src/mail/e-mail-reader.c:2401
+#: ../src/mail/e-mail-reader.c:2414
 msgid "_Add note..."
 msgstr "_Lisää huomautus..."
 
-#: ../src/mail/e-mail-reader.c:2403
+#: ../src/mail/e-mail-reader.c:2416
 #, fuzzy
 #| msgid "Create a new memo from the selected message"
 msgid "Add a note for the selected message"
 msgstr "Luo uusi muistilappu valitusta viestistä"
 
-#: ../src/mail/e-mail-reader.c:2408
+#: ../src/mail/e-mail-reader.c:2421
 msgid "Delete no_te"
 msgstr "Poista _huomautus"
 
-#: ../src/mail/e-mail-reader.c:2410
+#: ../src/mail/e-mail-reader.c:2423
 #, fuzzy
 #| msgid "Create a new event from the selected message"
 msgid "Delete the note for the selected message"
 msgstr "Luo uusi tapahtuma valitusta viestistä"
 
-#: ../src/mail/e-mail-reader.c:2415
+#: ../src/mail/e-mail-reader.c:2428
 msgid "_Edit note..."
 msgstr "_Muokkaa huomautusta..."
 
-#: ../src/mail/e-mail-reader.c:2417
+#: ../src/mail/e-mail-reader.c:2430
 #, fuzzy
 #| msgid "Create a new memo from the selected message"
 msgid "Edit a note for the selected message"
 msgstr "Luo uusi muistilappu valitusta viestistä"
 
-#: ../src/mail/e-mail-reader.c:2422
+#: ../src/mail/e-mail-reader.c:2435
 msgid "Create a Filter Rule for Mailing _List..."
 msgstr "Luo suodatussääntö postitus_listan mukaan..."
 
-#: ../src/mail/e-mail-reader.c:2424
+#: ../src/mail/e-mail-reader.c:2437
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "Luo sääntö, jolla suodatetaan viestejä tälle postilistalle"
 
-#: ../src/mail/e-mail-reader.c:2429
+#: ../src/mail/e-mail-reader.c:2442
 msgid "Create a Filter Rule for _Recipients..."
 msgstr "Luo suodatussääntö _vastaanottajien mukaan..."
 
-#: ../src/mail/e-mail-reader.c:2431
+#: ../src/mail/e-mail-reader.c:2444
 msgid "Create a rule to filter messages to these recipients"
 msgstr "Luo sääntö, jolla suodatetaan viestejä näille vastaanottajille"
 
-#: ../src/mail/e-mail-reader.c:2436
+#: ../src/mail/e-mail-reader.c:2449
 msgid "Create a Filter Rule for Se_nder..."
 msgstr "Luo suodatussääntö _lähettäjän mukaan..."
 
-#: ../src/mail/e-mail-reader.c:2438
+#: ../src/mail/e-mail-reader.c:2451
 msgid "Create a rule to filter messages from this sender"
 msgstr "Luo sääntö, jolla suodatetaan viestejä tältä lähettäjältä"
 
-#: ../src/mail/e-mail-reader.c:2443
+#: ../src/mail/e-mail-reader.c:2456
 msgid "Create a Filter Rule for _Subject..."
 msgstr "Luo suodatusääntö _aiheen mukaan..."
 
-#: ../src/mail/e-mail-reader.c:2445
+#: ../src/mail/e-mail-reader.c:2458
 msgid "Create a rule to filter messages with this subject"
 msgstr "Luo sääntö, jolla suodatetaan viestejä tämän otsikon perusteella"
 
-#: ../src/mail/e-mail-reader.c:2450
+#: ../src/mail/e-mail-reader.c:2463
 msgid "A_pply Filters"
 msgstr "_Toteuta suodattimet"
 
-#: ../src/mail/e-mail-reader.c:2452
+#: ../src/mail/e-mail-reader.c:2465
 msgid "Apply filter rules to the selected messages"
 msgstr "Suodata valitut viestit suodatinsäännöillä"
 
-#: ../src/mail/e-mail-reader.c:2457
+#: ../src/mail/e-mail-reader.c:2470
 msgid "_Find in Message..."
 msgstr "_Etsi viestistä..."
 
-#: ../src/mail/e-mail-reader.c:2459
+#: ../src/mail/e-mail-reader.c:2472
 msgid "Search for text in the body of the displayed message"
 msgstr "Etsiä tekstiä näytetyn viestin rungosta"
 
-#: ../src/mail/e-mail-reader.c:2464
+#: ../src/mail/e-mail-reader.c:2477
 msgid "_Clear Flag"
 msgstr "_Poista merkki"
 
-#: ../src/mail/e-mail-reader.c:2466
+#: ../src/mail/e-mail-reader.c:2479
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "Poista vastausmerkintä valituista viesteistä"
 
-#: ../src/mail/e-mail-reader.c:2471
+#: ../src/mail/e-mail-reader.c:2484
 msgid "_Flag Completed"
 msgstr "_Merkitse valmiiksi"
 
-#: ../src/mail/e-mail-reader.c:2473
+#: ../src/mail/e-mail-reader.c:2486
 msgid "Set the follow-up flag to completed on the selected messages"
 msgstr "Merkitse valittujen viestien vastausmerkintä valmiiksi"
 
-#: ../src/mail/e-mail-reader.c:2478
+#: ../src/mail/e-mail-reader.c:2491
 msgid "Follow _Up..."
 msgstr "_Vastaa viestiin..."
 
-#: ../src/mail/e-mail-reader.c:2480
+#: ../src/mail/e-mail-reader.c:2493
 msgid "Flag the selected messages for follow-up"
 msgstr "Merkitse valitut viestit vastattaviksi"
 
-#: ../src/mail/e-mail-reader.c:2485
+#: ../src/mail/e-mail-reader.c:2498
 #: ../src/modules/mail/e-mail-attachment-handler.c:431
 msgid "_Attached"
 msgstr "_Liitetty"
 
-#: ../src/mail/e-mail-reader.c:2487 ../src/mail/e-mail-reader.c:2494
+#: ../src/mail/e-mail-reader.c:2500 ../src/mail/e-mail-reader.c:2507
 #: ../src/modules/mail/e-mail-attachment-handler.c:433
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Välitä edelleen valitut viestit liitteenä"
 
-#: ../src/mail/e-mail-reader.c:2492
+#: ../src/mail/e-mail-reader.c:2505
 msgid "Forward As _Attached"
 msgstr "Välitä _liitteenä"
 
-#: ../src/mail/e-mail-reader.c:2499
+#: ../src/mail/e-mail-reader.c:2512
 #: ../src/modules/mail/e-mail-attachment-handler.c:438
 msgid "_Inline"
 msgstr "S_isäkkäisesti"
 
-#: ../src/mail/e-mail-reader.c:2501 ../src/mail/e-mail-reader.c:2508
+#: ../src/mail/e-mail-reader.c:2514 ../src/mail/e-mail-reader.c:2521
 #: ../src/modules/mail/e-mail-attachment-handler.c:440
 msgid "Forward the selected message in the body of a new message"
 msgstr "Välitä edelleen valitut viestit uuden viestin rungossa"
 
-#: ../src/mail/e-mail-reader.c:2506
+#: ../src/mail/e-mail-reader.c:2519
 msgid "Forward As _Inline"
 msgstr "Välitä _rungossa"
 
-#: ../src/mail/e-mail-reader.c:2513
+#: ../src/mail/e-mail-reader.c:2526
 #: ../src/modules/mail/e-mail-attachment-handler.c:445
 msgid "_Quoted"
 msgstr "_Lainattuna"
 
-#: ../src/mail/e-mail-reader.c:2515 ../src/mail/e-mail-reader.c:2522
+#: ../src/mail/e-mail-reader.c:2528 ../src/mail/e-mail-reader.c:2535
 #: ../src/modules/mail/e-mail-attachment-handler.c:447
 msgid "Forward the selected message quoted like a reply"
 msgstr "Välitä edelleen valitut viestit lainattuna vastauksen tapaan"
 
-#: ../src/mail/e-mail-reader.c:2520
+#: ../src/mail/e-mail-reader.c:2533
 msgid "Forward As _Quoted"
 msgstr "Välitä _lainattuna"
 
-#: ../src/mail/e-mail-reader.c:2527
+#: ../src/mail/e-mail-reader.c:2540
 msgid "_New Label"
 msgstr "_uusi merkintä"
 
 #. Translators: "None" is used in the message label context menu.
 #. *              It removes all labels from the selected messages.
-#: ../src/mail/e-mail-reader.c:2536
+#: ../src/mail/e-mail-reader.c:2549
 msgid "N_one"
 msgstr "Ei _mitään"
 
-#: ../src/mail/e-mail-reader.c:2543
+#: ../src/mail/e-mail-reader.c:2556
 msgid "_Load Images"
 msgstr "_Lataa kuvat"
 
-#: ../src/mail/e-mail-reader.c:2545
+#: ../src/mail/e-mail-reader.c:2558
 msgid "Force images in HTML mail to be loaded"
 msgstr "Pakota HTML-viestissä olevien kuvien lataus"
 
-#: ../src/mail/e-mail-reader.c:2550 ../src/mail/e-mail-reader.c:2962
+#: ../src/mail/e-mail-reader.c:2563 ../src/mail/e-mail-reader.c:2982
 msgid "_Ignore Subthread"
 msgstr "_Jätä huomiotta aliketju"
 
-#: ../src/mail/e-mail-reader.c:2552
+#: ../src/mail/e-mail-reader.c:2565
 msgid "Mark new mails in a subthread as read automatically"
 msgstr ""
 
-#: ../src/mail/e-mail-reader.c:2557 ../src/mail/e-mail-reader.c:2966
+#: ../src/mail/e-mail-reader.c:2570 ../src/mail/e-mail-reader.c:2986
 msgid "_Ignore Thread"
 msgstr "_Jätä huomiotta ketju"
 
-#: ../src/mail/e-mail-reader.c:2559
+#: ../src/mail/e-mail-reader.c:2572
 msgid "Mark new mails in this thread as read automatically"
 msgstr ""
 
-#: ../src/mail/e-mail-reader.c:2564
+#: ../src/mail/e-mail-reader.c:2577
 msgid "_Important"
 msgstr "_Tärkeä"
 
-#: ../src/mail/e-mail-reader.c:2566
+#: ../src/mail/e-mail-reader.c:2579
 msgid "Mark the selected messages as important"
 msgstr "Merkitse valitut viestit tärkeiksi"
 
-#: ../src/mail/e-mail-reader.c:2571
+#: ../src/mail/e-mail-reader.c:2584
 msgid "_Junk"
 msgstr "_Roskapostia"
 
-#: ../src/mail/e-mail-reader.c:2573
+#: ../src/mail/e-mail-reader.c:2586
 msgid "Mark the selected messages as junk"
 msgstr "Merkitse valitut viestit roskapostiksi"
 
-#: ../src/mail/e-mail-reader.c:2578
+#: ../src/mail/e-mail-reader.c:2591
 msgid "_Not Junk"
 msgstr "_Ei roskapostia"
 
-#: ../src/mail/e-mail-reader.c:2580
+#: ../src/mail/e-mail-reader.c:2593
 msgid "Mark the selected messages as not being junk"
 msgstr "Merkitse valitut viestit ei-roskapostiksi"
 
-#: ../src/mail/e-mail-reader.c:2585
+#: ../src/mail/e-mail-reader.c:2598
 msgid "_Read"
 msgstr "_Luettu"
 
-#: ../src/mail/e-mail-reader.c:2587
+#: ../src/mail/e-mail-reader.c:2600
 msgid "Mark the selected messages as having been read"
 msgstr "Merkitse valitut viestit luetuiksi"
 
-#: ../src/mail/e-mail-reader.c:2592 ../src/mail/e-mail-reader.c:2986
+#: ../src/mail/e-mail-reader.c:2605 ../src/mail/e-mail-reader.c:3006
 #, fuzzy
 #| msgid "Could not create publish thread."
 msgid "Do not _Ignore Subthread"
 msgstr "Julkaisusäiettä ei voitu luoda."
 
-#: ../src/mail/e-mail-reader.c:2594
+#: ../src/mail/e-mail-reader.c:2607
 msgid "Do not mark new mails in a subthread as read automatically"
 msgstr ""
 
-#: ../src/mail/e-mail-reader.c:2599 ../src/mail/e-mail-reader.c:2990
+#: ../src/mail/e-mail-reader.c:2612 ../src/mail/e-mail-reader.c:3010
 msgid "Do not _Ignore Thread"
 msgstr ""
 
-#: ../src/mail/e-mail-reader.c:2601
+#: ../src/mail/e-mail-reader.c:2614
 msgid "Do not mark new mails in this thread as read automatically"
 msgstr ""
 
-#: ../src/mail/e-mail-reader.c:2606
+#: ../src/mail/e-mail-reader.c:2619
 msgid "Uni_mportant"
 msgstr "Sa_mantekevä"
 
-#: ../src/mail/e-mail-reader.c:2608
+#: ../src/mail/e-mail-reader.c:2621
 msgid "Mark the selected messages as unimportant"
 msgstr "Merkitse valitut viestit samantekeviksi"
 
-#: ../src/mail/e-mail-reader.c:2613
+#: ../src/mail/e-mail-reader.c:2626
 msgid "_Unread"
 msgstr "L_ukematon"
 
-#: ../src/mail/e-mail-reader.c:2615
+#: ../src/mail/e-mail-reader.c:2628
 msgid "Mark the selected messages as not having been read"
 msgstr "Merkitse valitut viestit lukemattomiksi"
 
-#: ../src/mail/e-mail-reader.c:2620
+#: ../src/mail/e-mail-reader.c:2633
 #: ../src/modules/mail/e-mail-attachment-handler.c:417
 msgid "_Edit as New Message..."
 msgstr "_Muokkaa uutena viestinä..."
 
-#: ../src/mail/e-mail-reader.c:2622
+#: ../src/mail/e-mail-reader.c:2635
 #: ../src/modules/mail/e-mail-attachment-handler.c:419
 msgid "Open the selected messages in the composer for editing"
 msgstr "Avaa valitut viestit muokkaimessa"
 
-#: ../src/mail/e-mail-reader.c:2627
+#: ../src/mail/e-mail-reader.c:2640
 msgid "Compose _New Message"
 msgstr "Kirjoita _uusi viesti"
 
-#: ../src/mail/e-mail-reader.c:2629
+#: ../src/mail/e-mail-reader.c:2642
 msgid "Open a window for composing a mail message"
 msgstr "Luo uusi ikkuna sähköpostin kirjoitusikkuna"
 
-#: ../src/mail/e-mail-reader.c:2634
+#: ../src/mail/e-mail-reader.c:2647
 msgid "_Open in New Window"
 msgstr "Avaa _uudessa ikkunassa"
 
-#: ../src/mail/e-mail-reader.c:2636
+#: ../src/mail/e-mail-reader.c:2649
 msgid "Open the selected messages in a new window"
 msgstr "Avaa valitut viestit uudessa ikkunassa"
 
-#: ../src/mail/e-mail-reader.c:2641
+#: ../src/mail/e-mail-reader.c:2654
 msgid "_Move to Folder..."
 msgstr "_Siirrä kansioon..."
 
-#: ../src/mail/e-mail-reader.c:2643
+#: ../src/mail/e-mail-reader.c:2656
 msgid "Move selected messages to another folder"
 msgstr "Siirrä valitut viestit toiseen kansioon"
 
-#: ../src/mail/e-mail-reader.c:2648
+#: ../src/mail/e-mail-reader.c:2661
 msgid "_Next Message"
 msgstr "_Seuraava viesti"
 
-#: ../src/mail/e-mail-reader.c:2650
+#: ../src/mail/e-mail-reader.c:2663
 msgid "Display the next message"
 msgstr "Näytä seuraava viesti"
 
-#: ../src/mail/e-mail-reader.c:2655
+#: ../src/mail/e-mail-reader.c:2668
 msgid "Next _Important Message"
 msgstr "Seuraava _tärkeä viesti"
 
-#: ../src/mail/e-mail-reader.c:2657
+#: ../src/mail/e-mail-reader.c:2670
 msgid "Display the next important message"
 msgstr "Näytä seuraava tärkeä viesti"
 
-#: ../src/mail/e-mail-reader.c:2662
+#: ../src/mail/e-mail-reader.c:2675
 msgid "Next _Thread"
 msgstr "Seuraava _säie"
 
-#: ../src/mail/e-mail-reader.c:2664
+#: ../src/mail/e-mail-reader.c:2677
 msgid "Display the next thread"
 msgstr "Näytä seuraava säie"
 
-#: ../src/mail/e-mail-reader.c:2669
+#: ../src/mail/e-mail-reader.c:2682
 msgid "Next _Unread Message"
 msgstr "Seuraava _lukematon viesti"
 
-#: ../src/mail/e-mail-reader.c:2671
+#: ../src/mail/e-mail-reader.c:2684
 msgid "Display the next unread message"
 msgstr "Näytä seuraava lukematon viesti"
 
-#: ../src/mail/e-mail-reader.c:2676
+#: ../src/mail/e-mail-reader.c:2689
 msgid "_Previous Message"
 msgstr "_Edellinen viesti"
 
-#: ../src/mail/e-mail-reader.c:2678
+#: ../src/mail/e-mail-reader.c:2691
 msgid "Display the previous message"
 msgstr "Näytä edellinen viesti"
 
-#: ../src/mail/e-mail-reader.c:2683
+#: ../src/mail/e-mail-reader.c:2696
 msgid "Pr_evious Important Message"
 msgstr "E_dellinen tärkeä viesti"
 
-#: ../src/mail/e-mail-reader.c:2685
+#: ../src/mail/e-mail-reader.c:2698
 msgid "Display the previous important message"
 msgstr "Näytä edellinen tärkeä viesti"
 
-#: ../src/mail/e-mail-reader.c:2690
+#: ../src/mail/e-mail-reader.c:2703
 msgid "Previous T_hread"
 msgstr "_Edellinen säie"
 
-#: ../src/mail/e-mail-reader.c:2692
+#: ../src/mail/e-mail-reader.c:2705
 msgid "Display the previous thread"
 msgstr "Näytä edellinen säie"
 
-#: ../src/mail/e-mail-reader.c:2697
+#: ../src/mail/e-mail-reader.c:2710
 msgid "P_revious Unread Message"
 msgstr "_Edellinen lukematon viesti"
 
-#: ../src/mail/e-mail-reader.c:2699
+#: ../src/mail/e-mail-reader.c:2712
 msgid "Display the previous unread message"
 msgstr "Näytä edellinen lukematon viesti"
 
-#: ../src/mail/e-mail-reader.c:2706
+#: ../src/mail/e-mail-reader.c:2719
 msgid "Print this message"
 msgstr "Tulosta tämä viesti"
 
-#: ../src/mail/e-mail-reader.c:2713
+#: ../src/mail/e-mail-reader.c:2726
 msgid "Preview the message to be printed"
 msgstr "Esikatsele tulostettavaa viestiä"
 
-#: ../src/mail/e-mail-reader.c:2718
+#: ../src/mail/e-mail-reader.c:2731
 #: ../src/modules/mail/e-mail-attachment-handler.c:452
 msgid "Re_direct"
 msgstr "_Uudelleenohjaa"
 
-#: ../src/mail/e-mail-reader.c:2720
+#: ../src/mail/e-mail-reader.c:2733
 #: ../src/modules/mail/e-mail-attachment-handler.c:454
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Uudelleenohjaa (siirrä) valitut viestit jollekulle"
 
-#: ../src/mail/e-mail-reader.c:2725
+#: ../src/mail/e-mail-reader.c:2738
 msgid "Remo_ve Attachments"
 msgstr "Poista liittee_t"
 
-#: ../src/mail/e-mail-reader.c:2727
+#: ../src/mail/e-mail-reader.c:2740
 msgid "Remove attachments"
 msgstr "Poista liitteet"
 
-#: ../src/mail/e-mail-reader.c:2732
+#: ../src/mail/e-mail-reader.c:2745
 msgid "Remove Du_plicate Messages"
 msgstr "Poista viestin _kaksoiskappaleet"
 
-#: ../src/mail/e-mail-reader.c:2734
+#: ../src/mail/e-mail-reader.c:2747
 msgid "Checks selected messages for duplicates"
 msgstr "Etsii valituista viesteistä kaksoiskappaleita"
 
-#: ../src/mail/e-mail-reader.c:2739 ../src/mail/em-composer-utils.c:4012
+#: ../src/mail/e-mail-reader.c:2752 ../src/mail/em-composer-utils.c:4227
 #: ../src/mail/mail.error.xml.h:28
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:1500
 #: ../src/modules/mail/e-mail-attachment-handler.c:396
 msgid "Reply to _All"
 msgstr "Vastaa k_aikille"
 
-#: ../src/mail/e-mail-reader.c:2741
+#: ../src/mail/e-mail-reader.c:2754
 #: ../src/modules/mail/e-mail-attachment-handler.c:398
 msgid "Compose a reply to all the recipients of the selected message"
 msgstr "Kirjoita vastaus kaikille valitun viestin vastaanottajille"
 
-#: ../src/mail/e-mail-reader.c:2746
+#: ../src/mail/e-mail-reader.c:2759
 msgid "Al_ternative Reply…"
 msgstr ""
 
-#: ../src/mail/e-mail-reader.c:2748
+#: ../src/mail/e-mail-reader.c:2761
 #, fuzzy
 #| msgid "Compose a reply to the sender of the selected message"
 msgid "Choose reply options for the selected message"
 msgstr "Vastaa valitun viestin lähettäjälle"
 
-#: ../src/mail/e-mail-reader.c:2753 ../src/mail/em-composer-utils.c:4007
+#: ../src/mail/e-mail-reader.c:2766 ../src/mail/em-composer-utils.c:4222
 #: ../src/mail/mail.error.xml.h:26
 #: ../src/modules/mail/e-mail-attachment-handler.c:403
 msgid "Reply to _List"
 msgstr "Vastaa _listalle"
 
-#: ../src/mail/e-mail-reader.c:2755
+#: ../src/mail/e-mail-reader.c:2768
 #: ../src/modules/mail/e-mail-attachment-handler.c:405
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "Kirjoita vastaus valitussa viestissä olevalle sähköpostilistalle"
 
-#: ../src/mail/e-mail-reader.c:2760
+#: ../src/mail/e-mail-reader.c:2773
 #: ../src/modules/mail/e-mail-attachment-handler.c:410
 msgid "_Reply to Sender"
 msgstr "_Vastaa lähettäjälle"
 
-#: ../src/mail/e-mail-reader.c:2762
+#: ../src/mail/e-mail-reader.c:2775
 #: ../src/modules/mail/e-mail-attachment-handler.c:412
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Vastaa valitun viestin lähettäjälle"
 
-#: ../src/mail/e-mail-reader.c:2767
+#: ../src/mail/e-mail-reader.c:2780
 msgid "_Save as mbox..."
 msgstr "_Tallenna mbox-muodossa..."
 
-#: ../src/mail/e-mail-reader.c:2769
+#: ../src/mail/e-mail-reader.c:2782
 msgid "Save selected messages as an mbox file"
 msgstr "Tallenna valitut viestit mbox-tiedostona"
 
-#: ../src/mail/e-mail-reader.c:2774
+#: ../src/mail/e-mail-reader.c:2794
 msgid "_Message Source"
 msgstr "_Viestin lähdekoodi"
 
-#: ../src/mail/e-mail-reader.c:2776
+#: ../src/mail/e-mail-reader.c:2796
 msgid "Show the raw email source of the message"
 msgstr "Näytä viestin raakatekstimuotoinen lähdekoodi"
 
-#: ../src/mail/e-mail-reader.c:2788
+#: ../src/mail/e-mail-reader.c:2808
 msgid "_Undelete Message"
 msgstr "_Palauta viesti"
 
-#: ../src/mail/e-mail-reader.c:2790
+#: ../src/mail/e-mail-reader.c:2810
 msgid "Undelete the selected messages"
 msgstr "Palauta valitut viestit"
 
-#: ../src/mail/e-mail-reader.c:2795
+#: ../src/mail/e-mail-reader.c:2815
 msgid "_Normal Size"
 msgstr "_Normaali koko"
 
-#: ../src/mail/e-mail-reader.c:2797
+#: ../src/mail/e-mail-reader.c:2817
 msgid "Reset the text to its original size"
 msgstr "Palauta teksti alkuperäisen kokoiseksi"
 
-#: ../src/mail/e-mail-reader.c:2802
+#: ../src/mail/e-mail-reader.c:2822
 msgid "_Zoom In"
 msgstr "Lä_hennä"
 
-#: ../src/mail/e-mail-reader.c:2804
+#: ../src/mail/e-mail-reader.c:2824
 msgid "Increase the text size"
 msgstr "Kasvata tekstin kokoa"
 
-#: ../src/mail/e-mail-reader.c:2811
+#: ../src/mail/e-mail-reader.c:2831
 msgid "Decrease the text size"
 msgstr "Pienennä tekstin kokoa"
 
-#: ../src/mail/e-mail-reader.c:2818
+#: ../src/mail/e-mail-reader.c:2838
 msgid "Cre_ate"
 msgstr "_Luo"
 
-#: ../src/mail/e-mail-reader.c:2825
+#: ../src/mail/e-mail-reader.c:2845
 msgid "Ch_aracter Encoding"
 msgstr "Merkistön _koodaus"
 
-#: ../src/mail/e-mail-reader.c:2832
+#: ../src/mail/e-mail-reader.c:2852
 #: ../src/modules/mail/e-mail-attachment-handler.c:424
 msgid "F_orward As"
 msgstr "_Välitä muodossa"
 
-#: ../src/mail/e-mail-reader.c:2839
+#: ../src/mail/e-mail-reader.c:2859
 msgid "_Label"
 msgstr "_Merkintä"
 
-#: ../src/mail/e-mail-reader.c:2846
+#: ../src/mail/e-mail-reader.c:2866
 msgid "_Group Reply"
 msgstr "_Vastaa ryhmälle"
 
-#: ../src/mail/e-mail-reader.c:2853
+#: ../src/mail/e-mail-reader.c:2873
 msgid "_Go To"
 msgstr "_Siirry"
 
-#: ../src/mail/e-mail-reader.c:2860
+#: ../src/mail/e-mail-reader.c:2880
 msgid "Mar_k As"
 msgstr "Mer_kitse"
 
-#: ../src/mail/e-mail-reader.c:2867
+#: ../src/mail/e-mail-reader.c:2887
 msgid "_Message"
 msgstr "_Viesti"
 
-#: ../src/mail/e-mail-reader.c:2874
+#: ../src/mail/e-mail-reader.c:2894
 msgid "_Zoom"
 msgstr "_Suurenna"
 
-#: ../src/mail/e-mail-reader.c:2884
+#: ../src/mail/e-mail-reader.c:2904
 msgid "Create a Search Folder from Mailing _List..."
 msgstr "Luo hakukansio _postilistasta..."
 
-#: ../src/mail/e-mail-reader.c:2886
+#: ../src/mail/e-mail-reader.c:2906
 msgid "Create a search folder for this mailing list"
 msgstr "Luo hakunäkymä tästä postilistasta"
 
-#: ../src/mail/e-mail-reader.c:2891
+#: ../src/mail/e-mail-reader.c:2911
 msgid "Create a Search Folder from Recipien_ts..."
 msgstr "Luo hakukansio _vastaanottajista..."
 
-#: ../src/mail/e-mail-reader.c:2893
+#: ../src/mail/e-mail-reader.c:2913
 msgid "Create a search folder for these recipients"
 msgstr "Luo hakunäkymä näistä vastaanottajista"
 
-#: ../src/mail/e-mail-reader.c:2898
+#: ../src/mail/e-mail-reader.c:2918
 msgid "Create a Search Folder from Sen_der..."
 msgstr "Luo hakukansio _lähettäjästä..."
 
-#: ../src/mail/e-mail-reader.c:2900
+#: ../src/mail/e-mail-reader.c:2920
 msgid "Create a search folder for this sender"
 msgstr "Luo hakunäkymä tästä lähettäjästä"
 
-#: ../src/mail/e-mail-reader.c:2905
+#: ../src/mail/e-mail-reader.c:2925
 msgid "Create a Search Folder from S_ubject..."
 msgstr "Luo hakukansio _aiheesta..."
 
-#: ../src/mail/e-mail-reader.c:2907
+#: ../src/mail/e-mail-reader.c:2927
 msgid "Create a search folder for this subject"
 msgstr "Luo hakunäkymä tästä aiheesta"
 
-#: ../src/mail/e-mail-reader.c:2954
+#: ../src/mail/e-mail-reader.c:2974
 msgid "Mark for Follo_w Up..."
 msgstr "_Merkitse edelleen lähetettäväksi..."
 
-#: ../src/mail/e-mail-reader.c:2970
+#: ../src/mail/e-mail-reader.c:2990
 msgid "Mark as _Important"
 msgstr "Merkitse _tärkeäksi"
 
-#: ../src/mail/e-mail-reader.c:2974
+#: ../src/mail/e-mail-reader.c:2994
 msgid "Mark as _Junk"
 msgstr "Luokittele _roskapostiksi"
 
-#: ../src/mail/e-mail-reader.c:2978
+#: ../src/mail/e-mail-reader.c:2998
 msgid "Mark as _Not Junk"
 msgstr "Luokittele _ei-roskapostiksi"
 
-#: ../src/mail/e-mail-reader.c:2982
+#: ../src/mail/e-mail-reader.c:3002
 msgid "Mar_k as Read"
 msgstr "Merkitse _luetuksi"
 
-#: ../src/mail/e-mail-reader.c:2994
+#: ../src/mail/e-mail-reader.c:3014
 msgid "Mark as Uni_mportant"
 msgstr "Merkitse yhden_tekeväksi"
 
-#: ../src/mail/e-mail-reader.c:2998
+#: ../src/mail/e-mail-reader.c:3018
 msgid "Mark as _Unread"
 msgstr "Merkitse _lukemattomaksi"
 
-#: ../src/mail/e-mail-reader.c:3042
+#: ../src/mail/e-mail-reader.c:3066
 msgid "_Caret Mode"
 msgstr "Kohdistin_tila"
 
-#: ../src/mail/e-mail-reader.c:3044
+#: ../src/mail/e-mail-reader.c:3068
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Näytä välkkyvä kursori näytettävien viestin rungossa"
 
-#: ../src/mail/e-mail-reader.c:3050
+#: ../src/mail/e-mail-reader.c:3074
 msgid "All Message _Headers"
 msgstr "Kaikki viestin _otsikot"
 
-#: ../src/mail/e-mail-reader.c:3052
+#: ../src/mail/e-mail-reader.c:3076
 msgid "Show messages with all email headers"
 msgstr "Näytä viesti kaikilla otsakkeillaan"
 
-#: ../src/mail/e-mail-reader.c:3630
+#: ../src/mail/e-mail-reader.c:3647
 msgid "Retrieving message"
 msgstr "Noudetaan viesti"
 
-#: ../src/mail/e-mail-reader.c:4927
+#: ../src/mail/e-mail-reader.c:4951
 #: ../src/modules/mail/e-mail-attachment-handler.c:389
 msgid "_Forward"
 msgstr "_Välitä"
 
-#: ../src/mail/e-mail-reader.c:4928
+#: ../src/mail/e-mail-reader.c:4952
 #: ../src/modules/mail/e-mail-attachment-handler.c:391
 msgid "Forward the selected message to someone"
 msgstr "Välitä edelleen valitut viestit jollekulle"
@@ -17845,52 +18038,52 @@ msgstr "Välitä edelleen valitut viestit jollekulle"
 #. * (if possible and if that configuration option is enabled), or else
 #. * it will reply to all. The word "Group" was chosen because it covers
 #. * either of those, without too strongly implying one or the other.
-#: ../src/mail/e-mail-reader.c:4947
+#: ../src/mail/e-mail-reader.c:4971
 msgid "Group Reply"
 msgstr "Vastaa ryhmälle"
 
-#: ../src/mail/e-mail-reader.c:4948
+#: ../src/mail/e-mail-reader.c:4972
 msgid "Reply to the mailing list, or to all recipients"
 msgstr "Vastaa sähköpostilistalle tai kaikille vastaanottajille"
 
-#: ../src/mail/e-mail-reader.c:5014 ../src/mail/filtertypes.xml.in.h:67
+#: ../src/mail/e-mail-reader.c:5038 ../src/mail/filtertypes.xml.in.h:67
 msgid "Delete"
 msgstr "Poista"
 
-#: ../src/mail/e-mail-reader.c:5026
+#: ../src/mail/e-mail-reader.c:5050
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:1297
 msgid "Next"
 msgstr "Seuraava"
 
-#: ../src/mail/e-mail-reader.c:5030
+#: ../src/mail/e-mail-reader.c:5054
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:1290
 msgid "Previous"
 msgstr "Edellinen"
 
-#: ../src/mail/e-mail-reader.c:5039 ../src/mail/mail-dialogs.ui.h:9
+#: ../src/mail/e-mail-reader.c:5063 ../src/mail/mail-dialogs.ui.h:9
 msgid "Reply"
 msgstr "Vastaa"
 
-#: ../src/mail/e-mail-reader.c:6194
+#: ../src/mail/e-mail-reader.c:6218
 #, c-format
 msgid "Allow remote content for anyone from %s"
 msgstr ""
 
-#: ../src/mail/e-mail-reader.c:6196
+#: ../src/mail/e-mail-reader.c:6220
 #, c-format
 msgid "Allow remote content for %s"
 msgstr ""
 
-#: ../src/mail/e-mail-reader.c:6213
+#: ../src/mail/e-mail-reader.c:6237
 #, c-format
 msgid "Allow remote content from %s"
 msgstr "Salli etäsisältö lähettäjältä %s"
 
-#: ../src/mail/e-mail-reader.c:6230
+#: ../src/mail/e-mail-reader.c:6254
 msgid "Do not show this message again"
 msgstr "Älä näytä tätä viestiä uudestaan"
 
-#: ../src/mail/e-mail-reader.c:6282
+#: ../src/mail/e-mail-reader.c:6306
 msgid "Load remote content"
 msgstr "Lataa etäsisältö"
 
@@ -17949,7 +18142,7 @@ msgstr[0] ""
 msgstr[1] ""
 "Kansio '%s' sisältää %u viestin kaksoiskappaleen. Haluatko varmasti poistaa sen?"
 
-#: ../src/mail/e-mail-reader-utils.c:2859
+#: ../src/mail/e-mail-reader-utils.c:2924
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "Tallenna viesti"
@@ -17960,13 +18153,13 @@ msgstr[1] "Tallenna viestit"
 #. * mbox format, when the first message doesn't have a
 #. * subject.  The extension ".mbox" is appended to the
 #. * string; for example "Message.mbox".
-#: ../src/mail/e-mail-reader-utils.c:2880
+#: ../src/mail/e-mail-reader-utils.c:2945
 msgid "Message"
 msgid_plural "Messages"
 msgstr[0] "Viesti"
 msgstr[1] "Viestit"
 
-#: ../src/mail/e-mail-reader-utils.c:3294
+#: ../src/mail/e-mail-reader-utils.c:3359
 msgid "Parsing message"
 msgstr "Jäsennetään viestiä"
 
@@ -17997,7 +18190,7 @@ msgid "No data source found for UID “%s”"
 msgstr ""
 
 #. Translators: The %d is replaced with the actual count of recipients, which is always more than one.
-#: ../src/mail/em-composer-utils.c:394
+#: ../src/mail/em-composer-utils.c:395
 #, fuzzy, c-format
 #| msgid "Are you sure you want to send a message with only BCC recipients?"
 msgid "Are you sure you want to send a message with %d To and CC recipients?"
@@ -18008,7 +18201,7 @@ msgstr[1] ""
 "Haluatko varmasti lähettää viestin, jossa on vain piilokopion vastaanottajia (Bcc)?"
 
 #. Translators: The %d is replaced with the actual count of recipients, which is always more than one.
-#: ../src/mail/em-composer-utils.c:400
+#: ../src/mail/em-composer-utils.c:401
 #, c-format
 msgid ""
 "You are trying to send a message to %d recipients in To and CC fields. This would "
@@ -18025,7 +18218,7 @@ msgstr[1] ""
 
 #. This message is never removed from the camel operation, otherwise the GtkInfoBar
 #. hides itself and the user sees no feedback.
-#: ../src/mail/em-composer-utils.c:828
+#: ../src/mail/em-composer-utils.c:829
 msgid "Waiting for attachments to load..."
 msgstr "Odotetaan liitteiden latautumista..."
 
@@ -18033,7 +18226,7 @@ msgstr "Odotetaan liitteiden latautumista..."
 #. * when quoting messages.  Each ${Variable} gets replaced
 #. * with a value.  To see a full list of available variables,
 #. * see mail/em-composer-utils.c:attribvars array.
-#: ../src/mail/em-composer-utils.c:2019
+#: ../src/mail/em-composer-utils.c:2176
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -18041,93 +18234,93 @@ msgstr ""
 "${AbbrevWeekdayName}, ${Year}-${Month}-${Day} kello ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} kirjoitti:"
 
-#: ../src/mail/em-composer-utils.c:2025
+#: ../src/mail/em-composer-utils.c:2182
 msgid "-------- Forwarded Message --------"
 msgstr "------- Välitetty viesti ---------"
 
-#: ../src/mail/em-composer-utils.c:2030
+#: ../src/mail/em-composer-utils.c:2187
 msgid "-----Original Message-----"
 msgstr "-----Alkuperäinen viesti-----"
 
 #. Translators: This is a reply attribution in the message reply subject. The %s is replaced with the 
subject of the original message. Both 'Re'-s in the 'reply-attribution' translation context should translate 
into the same string, the same as the ':' separator.
-#: ../src/mail/em-composer-utils.c:2714
+#: ../src/mail/em-composer-utils.c:2919
 #, fuzzy, c-format
 #| msgid "URL: %s"
 msgctxt "reply-attribution"
 msgid "Re: %s"
 msgstr "URL: %s"
 
-#: ../src/mail/em-composer-utils.c:3324
+#: ../src/mail/em-composer-utils.c:3529
 msgid "an unknown sender"
 msgstr "Tuntematon lähettäjä"
 
-#: ../src/mail/em-composer-utils.c:3958
+#: ../src/mail/em-composer-utils.c:4173
 msgid "Alternative Reply"
 msgstr ""
 
-#: ../src/mail/em-composer-utils.c:3961
+#: ../src/mail/em-composer-utils.c:4176
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:1493
 msgid "_Reply"
 msgstr "_Vastaa"
 
-#: ../src/mail/em-composer-utils.c:3974
+#: ../src/mail/em-composer-utils.c:4189
 #, fuzzy
 #| msgid "Recipients"
 msgid "Recipients:"
 msgstr "Vastaanottajat"
 
-#: ../src/mail/em-composer-utils.c:4002
+#: ../src/mail/em-composer-utils.c:4217
 #, fuzzy
 #| msgid "_Reply to Sender"
 msgid "Reply to _Sender"
 msgstr "_Vastaa lähettäjälle"
 
-#: ../src/mail/em-composer-utils.c:4024
+#: ../src/mail/em-composer-utils.c:4239
 #, fuzzy
 #| msgid "_Reply style:"
 msgid "Reply style:"
 msgstr "_Vastaustyyli:"
 
-#: ../src/mail/em-composer-utils.c:4032
+#: ../src/mail/em-composer-utils.c:4247
 msgid "_Default"
 msgstr "Oletu_s"
 
-#: ../src/mail/em-composer-utils.c:4036
+#: ../src/mail/em-composer-utils.c:4251
 msgid "Attach_ment"
 msgstr "Liit_e"
 
-#: ../src/mail/em-composer-utils.c:4040
+#: ../src/mail/em-composer-utils.c:4255
 #, fuzzy
 #| msgctxt "ReplyForward"
 #| msgid "Inline (Outlook style)"
 msgid "Inline (_Outlook style)"
 msgstr "Sisennetty (Outlookin tapaan)"
 
-#: ../src/mail/em-composer-utils.c:4044
+#: ../src/mail/em-composer-utils.c:4259
 msgid "_Quote"
 msgstr "_Lainaa"
 
-#: ../src/mail/em-composer-utils.c:4048
+#: ../src/mail/em-composer-utils.c:4263
 msgid "Do _Not Quote"
 msgstr "_Älä lainaa"
 
-#: ../src/mail/em-composer-utils.c:4055
+#: ../src/mail/em-composer-utils.c:4270
 msgid "_Format message in HTML"
 msgstr "Muotoile viesti _HTML:nä"
 
-#: ../src/mail/em-composer-utils.c:4065
+#: ../src/mail/em-composer-utils.c:4280
 #, fuzzy
 #| msgid "_Template:"
 msgid "Apply t_emplate"
 msgstr "_Malli:"
 
-#: ../src/mail/em-composer-utils.c:4077
+#: ../src/mail/em-composer-utils.c:4292
 #, fuzzy
 #| msgid "Original message"
 msgid "Preserve original message S_ubject"
 msgstr "Alkuperäinen viesti"
 
-#: ../src/mail/em-composer-utils.c:4143
+#: ../src/mail/em-composer-utils.c:4358
 #, fuzzy, c-format
 #| msgid "Sender or Recipients"
 msgid "one recipient"
@@ -18136,14 +18329,70 @@ msgstr[0] "Lähettäjä tai vastaanottajat"
 msgstr[1] "Lähettäjä tai vastaanottajat"
 
 #. FIXME GTK_WINDOW (composer)
-#: ../src/mail/em-composer-utils.c:4564
+#: ../src/mail/em-composer-utils.c:4776
 msgid "Posting destination"
 msgstr "Postituksen kohde"
 
-#: ../src/mail/em-composer-utils.c:4569
+#: ../src/mail/em-composer-utils.c:4781
 msgid "Choose folders to post the message to."
 msgstr "Valitse kansio johon viesti postitetaan:"
 
+#: ../src/mail/em-filter-editor.c:43
+#, fuzzy
+#| msgid "Description List"
+msgid "Description of Filters"
+msgstr "Kuvauslista"
+
+#. Translators: The first '%s' is replaced with the rule name;
+#. the second '%s' with 'enabled' or 'disabled' word;
+#. the third '%s' is replaced with the account name
+#: ../src/mail/em-filter-editor.c:167
+#, c-format
+msgid "%s (%s, for account %s)"
+msgstr ""
+
+#: ../src/mail/em-filter-editor.c:167 ../src/mail/em-filter-editor.c:171
+#, fuzzy
+#| msgid "Enabled"
+msgid "enabled"
+msgstr "käytössä"
+
+#: ../src/mail/em-filter-editor.c:167 ../src/mail/em-filter-editor.c:171
+#, fuzzy
+#| msgid "_Disable"
+msgid "disabled"
+msgstr "Älä _käytä"
+
+#. Translators: The first '%s' is replaced with the rule name;
+#. the second '%s' with 'enabled' or 'disabled' word
+#: ../src/mail/em-filter-editor.c:171
+#, c-format
+msgid "%s (%s, for any account)"
+msgstr ""
+
+#: ../src/mail/em-filter-editor.c:183
+#, fuzzy
+#| msgid "all the following conditions"
+msgid "If all the following conditions are met"
+msgstr "kaikkia seuraavia ehtoja"
+
+#: ../src/mail/em-filter-editor.c:186
+#, fuzzy
+#| msgid "any of the following conditions"
+msgid "If any of the following conditions are met"
+msgstr "mitä tahansa seuraavista ehdoista"
+
+#. and now for the action area
+#: ../src/mail/em-filter-editor.c:203 ../src/mail/em-filter-rule.c:1068
+msgid "Then"
+msgstr "sitten"
+
+#: ../src/mail/em-filter-editor.c:408
+#, fuzzy
+#| msgid "Message Filters"
+msgid "De_scribe Filters…"
+msgstr "Viestisuodattimet"
+
 #: ../src/mail/em-filter-editor-folder-element.c:154
 msgid "Select Folder"
 msgstr "Valitse kansio"
@@ -18164,49 +18413,44 @@ msgstr "Säänn_ön tyyppi:"
 msgid "_For Account:"
 msgstr "_Tili:"
 
-#. and now for the action area
-#: ../src/mail/em-filter-rule.c:1068
-msgid "Then"
-msgstr "sitten"
-
 #: ../src/mail/em-filter-rule.c:1141
 msgid "Add Ac_tion"
 msgstr "Lisää _toiminto"
 
-#: ../src/mail/em-folder-properties.c:240
+#: ../src/mail/em-folder-properties.c:241
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "Lukemattomia viestejä:"
 msgstr[1] "Lukemattomia viestejä:"
 
-#: ../src/mail/em-folder-properties.c:251
+#: ../src/mail/em-folder-properties.c:252
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "Viestejä kaikkiaan:"
 msgstr[1] "Viestejä kaikkiaan:"
 
-#: ../src/mail/em-folder-properties.c:272
+#: ../src/mail/em-folder-properties.c:273
 #, c-format
 msgid "Quota usage (%s):"
 msgstr "Levytilan käyttö (%s):"
 
-#: ../src/mail/em-folder-properties.c:274
+#: ../src/mail/em-folder-properties.c:275
 #, c-format
 msgid "Quota usage"
 msgstr "Levytilan käyttö"
 
 #. Translators: Label of a combo with a list of configured accounts where a user can
 #. choose which account to use as the sender when composing a message in this folder
-#: ../src/mail/em-folder-properties.c:398
+#: ../src/mail/em-folder-properties.c:419
 msgid "_Send Account Override:"
 msgstr "_Lähetystilin ohitus:"
 
-#: ../src/mail/em-folder-properties.c:605
+#: ../src/mail/em-folder-properties.c:626
 msgid "Archive this folder using these settings:"
 msgstr "Arkistoi tämä kansio käyttäen seuraavia asetuksia:"
 
 #. Translators: This text is part of "Auto-cleanup messages older than [X] [days/weeks/months]"
-#: ../src/mail/em-folder-properties.c:617
+#: ../src/mail/em-folder-properties.c:638
 #, fuzzy
 #| msgctxt "autoarchive"
 #| msgid "_Cleanup messages older than"
@@ -18215,79 +18459,79 @@ msgid "Auto-_cleanup messages older than"
 msgstr "_Siivoa vanhemmat viestit kuin"
 
 #. Translators: This text is part of "Auto-cleanup messages older than [X] [days/weeks/months]"
-#: ../src/mail/em-folder-properties.c:630
+#: ../src/mail/em-folder-properties.c:651
 msgctxt "autoarchive"
 msgid "days"
 msgstr "päivää"
 
 #. Translators: This text is part of "Auto-cleanup messages older than [X] [days/weeks/months]"
-#: ../src/mail/em-folder-properties.c:632
+#: ../src/mail/em-folder-properties.c:653
 msgctxt "autoarchive"
 msgid "weeks"
 msgstr "viikkoa"
 
 #. Translators: This text is part of "Auto-cleanup messages older than [X] [days/weeks/months]"
-#: ../src/mail/em-folder-properties.c:634
+#: ../src/mail/em-folder-properties.c:655
 msgctxt "autoarchive"
 msgid "months"
 msgstr "kuukautta"
 
-#: ../src/mail/em-folder-properties.c:640
+#: ../src/mail/em-folder-properties.c:661
 #, fuzzy
 #| msgid "Move old messages to the default archive _folder"
 msgid "Move messages to the default archive _folder"
 msgstr "Siirrä valitut viestit _oletusarkistokansioon"
 
-#: ../src/mail/em-folder-properties.c:647
+#: ../src/mail/em-folder-properties.c:668
 #, fuzzy
 #| msgid "_Move old messages to:"
 msgid "_Move messages to:"
 msgstr "Siirrä va_nhat viestit kansioon:"
 
-#: ../src/mail/em-folder-properties.c:651
+#: ../src/mail/em-folder-properties.c:672
 #, fuzzy
 #| msgid "AutoArchive folder"
 msgid "Archive folder"
 msgstr "Automaattisen arkistoinnin kansio"
 
-#: ../src/mail/em-folder-properties.c:651
+#: ../src/mail/em-folder-properties.c:672
 #, fuzzy
 #| msgid "Select folder to import into"
 msgid "Select folder to use for Archive"
 msgstr "Valitse kansio, johon tuodaan"
 
-#: ../src/mail/em-folder-properties.c:655
+#: ../src/mail/em-folder-properties.c:676
 msgid "_Delete messages"
 msgstr "Poista _viestit"
 
-#: ../src/mail/em-folder-properties.c:1010
+#: ../src/mail/em-folder-properties.c:1031
 #, fuzzy
 #| msgid "Server Type:"
 msgid "Server Tag"
 msgstr "Palvelintyyppi:"
 
-#: ../src/mail/em-folder-properties.c:1014 ../src/mail/filtertypes.xml.in.h:29
+#: ../src/mail/em-folder-properties.c:1035 ../src/mail/filtertypes.xml.in.h:29
 #: ../src/mail/searchtypes.xml.in.h:31 ../src/mail/vfoldertypes.xml.in.h:31
 msgid "Label"
 msgstr "Merkintä"
 
 #. Translators: "Archive" is a noun (This is a tab heading in the mail folder properties)
-#: ../src/mail/em-folder-properties.c:1066
+#: ../src/mail/em-folder-properties.c:1087
 #, fuzzy
 #| msgid "_Archive..."
 msgid "Archive"
 msgstr "_Arkistoi..."
 
-#: ../src/mail/em-folder-properties.c:1069 ../src/mail/mail-config.ui.h:121
+#: ../src/mail/em-folder-properties.c:1090 ../src/mail/mail-config.ui.h:123
 #: ../src/mail/message-list.etspec.h:19
 msgid "Labels"
 msgstr "Merkinnät"
 
-#: ../src/mail/em-folder-properties.c:1148
+#: ../src/mail/em-folder-properties.c:1169
 msgid "Folder Properties"
 msgstr "Kansion ominaisuudet"
 
-#: ../src/mail/em-folder-properties.c:1387
+#: ../src/mail/em-folder-properties.c:1408
 msgid "Gathering folder properties"
 msgstr "Kerätään kansion ominaisuuksia"
 
@@ -18341,12 +18585,12 @@ msgstr "Siirretään kansiota %s"
 msgid "Copying folder %s"
 msgstr "Kopioidaan kansiota %s"
 
-#: ../src/mail/em-folder-tree.c:2290 ../src/mail/message-list.c:2598
+#: ../src/mail/em-folder-tree.c:2290 ../src/mail/message-list.c:2632
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Siirretään viestejä kansioon %s"
 
-#: ../src/mail/em-folder-tree.c:2294 ../src/mail/message-list.c:2600
+#: ../src/mail/em-folder-tree.c:2294 ../src/mail/message-list.c:2634
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Kopioidaan viestejä kansioon %s"
@@ -18407,7 +18651,7 @@ msgstr "Tilaa kaikk_i"
 
 #: ../src/mail/em-subscription-editor.c:936 ../src/mail/em-subscription-editor.c:1888
 #: ../src/mail/mail.error.xml.h:73
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1574
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1660
 msgid "_Unsubscribe"
 msgstr "_Peru tilaus"
 
@@ -18421,9 +18665,9 @@ msgid "Unsubscribe From _All"
 msgstr "_Peru kaikkien tilaus"
 
 #: ../src/mail/em-subscription-editor.c:1313
-#: ../src/modules/mail/e-mail-shell-view-private.c:904
-#: ../src/modules/mail/e-mail-shell-view-private.c:936
-#: ../src/modules/mail/e-mail-shell-view-private.c:980
+#: ../src/modules/mail/e-mail-shell-view-private.c:933
+#: ../src/modules/mail/e-mail-shell-view-private.c:965
+#: ../src/modules/mail/e-mail-shell-view-private.c:1009
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
@@ -18431,7 +18675,7 @@ msgstr[0] "%d lukematon, "
 msgstr[1] "%d lukematonta, "
 
 #: ../src/mail/em-subscription-editor.c:1317
-#: ../src/modules/mail/e-mail-shell-view-private.c:990
+#: ../src/modules/mail/e-mail-shell-view-private.c:1019
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
@@ -18463,7 +18707,7 @@ msgid "Su_bscribe"
 msgstr "Tila_a"
 
 #: ../src/mail/em-subscription-editor.c:1887
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1576
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1662
 msgid "Unsubscribe from the selected folder"
 msgstr "Peru tämän kansion tilaus"
 
@@ -18528,7 +18772,7 @@ msgstr "Tee uudelleen"
 #: ../src/mail/em-utils.c:1578
 msgctxt "reply-attribution"
 msgid ":"
-msgstr ""
+msgstr ":"
 
 #: ../src/mail/em-utils.c:1878
 msgid "Deleting old messages"
@@ -18723,7 +18967,7 @@ msgstr "Tärkeä"
 msgid "Read"
 msgstr "Luettu"
 
-#: ../src/mail/filtertypes.xml.in.h:41 ../src/mail/mail-config.ui.h:137
+#: ../src/mail/filtertypes.xml.in.h:41 ../src/mail/mail-config.ui.h:139
 #: ../src/mail/vfoldertypes.xml.in.h:44
 msgid "Junk"
 msgstr "Roskaposti"
@@ -18911,7 +19155,7 @@ msgid "From"
 msgstr "Lähettäjä"
 
 #: ../src/mail/importers/evolution-mbox-importer.c:569
-#: ../src/shell/e-shell-utils.c:176
+#: ../src/shell/e-shell-utils.c:166
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Berkeley Mailbox (mbox)"
 
@@ -18935,7 +19179,7 @@ msgid "Import mail and contacts from KMail."
 msgstr "Tuo sähköpostit ja yhteystiedot KMailista."
 
 #: ../src/mail/importers/kmail-libs.c:150
-#: ../src/modules/mail/e-mail-shell-view-private.c:1011
+#: ../src/modules/mail/e-mail-shell-view-private.c:1040
 msgid "Trash"
 msgstr "Roskakori"
 
@@ -19099,50 +19343,54 @@ msgstr "_Vastaustyyli:"
 msgid "_Forward style:"
 msgstr "_Välitystyyli:"
 
-#: ../src/mail/mail-config.ui.h:22
+#: ../src/mail/mail-config.ui.h:20
+msgid "_Language:"
+msgstr "_Kieli:"
+
+#: ../src/mail/mail-config.ui.h:24
 msgid "Include si_gnature in new messages only"
-msgstr ""
+msgstr "_Sisällytä allekirjoitus vain uusiin viesteihin"
 
-#: ../src/mail/mail-config.ui.h:23
+#: ../src/mail/mail-config.ui.h:25
 msgid "Ig_nore Reply-To: for mailing lists"
 msgstr "Älä huomioi _postituslistojen Reply-To-otsaketta"
 
-#: ../src/mail/mail-config.ui.h:24
+#: ../src/mail/mail-config.ui.h:26
 msgid "Gro_up Reply goes only to mailing list, if possible"
 msgstr "Ryhmävastaus menee vain sä_hköpostilistalle, jos mahdollista"
 
-#: ../src/mail/mail-config.ui.h:25
+#: ../src/mail/mail-config.ui.h:27
 msgid "Digitally _sign messages when original message signed (PGP or S/MIME)"
 msgstr ""
 "Allekirjoita viestit _digitaalisesti alkuperäisen viestin ollessa allekirjoitettu "
 "(PGP tai S/MIME)"
 
-#: ../src/mail/mail-config.ui.h:26
+#: ../src/mail/mail-config.ui.h:28
 msgid "_Wrap quoted text in replies"
 msgstr ""
 
-#: ../src/mail/mail-config.ui.h:31
+#: ../src/mail/mail-config.ui.h:33
 msgctxt "ReplyForward"
 msgid "Inline"
 msgstr "Sisennettynä"
 
-#: ../src/mail/mail-config.ui.h:33
+#: ../src/mail/mail-config.ui.h:35
 msgid "Sig_natures"
 msgstr "A_llekirjoitukset"
 
-#: ../src/mail/mail-config.ui.h:34
+#: ../src/mail/mail-config.ui.h:36
 msgid "Signatures"
 msgstr "Allekirjoitukset"
 
-#: ../src/mail/mail-config.ui.h:35
+#: ../src/mail/mail-config.ui.h:37
 msgid "_Languages"
 msgstr "_Kielet"
 
-#: ../src/mail/mail-config.ui.h:36
+#: ../src/mail/mail-config.ui.h:38
 msgid "Languages Table"
 msgstr "Kielitaulukko"
 
-#: ../src/mail/mail-config.ui.h:37
+#: ../src/mail/mail-config.ui.h:39
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
@@ -19150,11 +19398,11 @@ msgstr ""
 "Luettelo käytettävissä olevista kielistä riippuu ainoastaan siitä, mille kielille "
 "sinulla on sanastoja asennettuna."
 
-#: ../src/mail/mail-config.ui.h:39
+#: ../src/mail/mail-config.ui.h:41
 msgid "Check spelling while I _type"
 msgstr "Tarkista _oikeinkirjoitus kirjoitettaessa"
 
-#: ../src/mail/mail-config.ui.h:41
+#: ../src/mail/mail-config.ui.h:43
 msgid ""
 "To help avoid email accidents and embarrassments, ask for confirmation before "
 "taking the following checkmarked actions:"
@@ -19163,82 +19411,82 @@ msgstr ""
 "tilanteissa etenemistä:"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../src/mail/mail-config.ui.h:43
+#: ../src/mail/mail-config.ui.h:45
 msgid "Sending a message with an _empty subject line"
 msgstr "Lähettäessä viestejä tyhjällä _Aihe-otsakkeella"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../src/mail/mail-config.ui.h:45
+#: ../src/mail/mail-config.ui.h:47
 msgid "Sending a message with only _Bcc recipients defined"
 msgstr "Jos ainoastaan _Bcc-vastaanottajia (piilokopio) on määritelty"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../src/mail/mail-config.ui.h:47
+#: ../src/mail/mail-config.ui.h:49
 #, fuzzy
 #| msgid "Sending a message with only _Bcc recipients defined"
 msgid "Sending a message to many _To and CC recipients"
 msgstr "Jos ainoastaan _Bcc-vastaanottajia (piilokopio) on määritelty"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../src/mail/mail-config.ui.h:49
+#: ../src/mail/mail-config.ui.h:51
 msgid "Sending a _private reply to a mailing list message"
 msgstr "Lähetettäessä yksityisiä vastauksia _sähköpostilistaviesteihin"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../src/mail/mail-config.ui.h:51
+#: ../src/mail/mail-config.ui.h:53
 msgid "Sending a reply to a large _number of recipients"
 msgstr "Lähettäessä vastausta suurelle määrälle _vastaanottajia"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../src/mail/mail-config.ui.h:53
+#: ../src/mail/mail-config.ui.h:55
 #, fuzzy
 msgid "Allowing a _mailing list to redirect a private reply to the list"
 msgstr ""
 "Kysy vahvistus, kun sähköpostilista ohjaa yksityisen vastauksen takaisin listalle"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../src/mail/mail-config.ui.h:55
+#: ../src/mail/mail-config.ui.h:57
 msgid "Sending a message with _recipients not entered as mail addresses"
 msgstr ""
 "Lähettäessä viestiä vastaanottajille, _joita ei ole kirjoitettu "
 "sähköpostiosoitteen muodossa"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../src/mail/mail-config.ui.h:57
+#: ../src/mail/mail-config.ui.h:59
 #, fuzzy
 #| msgid "Sending a message with an _empty subject line"
 msgid "Sending a message using _key accelerator (Ctrl+Enter)"
 msgstr "Lähettäessä viestejä tyhjällä _Aihe-otsakkeella"
 
 #. Translators:
-#: ../src/mail/mail-config.ui.h:59
+#: ../src/mail/mail-config.ui.h:61
 msgid "Before composer _format changes from HTML to Plain Text"
 msgstr ""
 
-#: ../src/mail/mail-config.ui.h:60
+#: ../src/mail/mail-config.ui.h:62
 msgid "Confirmations"
 msgstr "Vahvistukset"
 
 #. Translators: Label of a frame with a list of folders for which to use selected account in Send account 
overrides
-#: ../src/mail/mail-config.ui.h:64
+#: ../src/mail/mail-config.ui.h:66
 msgid "Use for Folders"
 msgstr "Käytä kansioille"
 
 #. Translators: Label of a frame with a list of recipients for whom to use selected account in Send account 
overrides
-#: ../src/mail/mail-config.ui.h:69
+#: ../src/mail/mail-config.ui.h:71
 msgid "Use for Recipients"
 msgstr "Käytä vastaanottajille"
 
 #. Translators: Label of a frame with a list of configured accounts in Send account overrides
-#: ../src/mail/mail-config.ui.h:71 ../src/modules/mail/em-composer-prefs.c:875
+#: ../src/mail/mail-config.ui.h:73 ../src/modules/mail/em-composer-prefs.c:876
 msgid "Account"
 msgstr "Tili"
 
-#: ../src/mail/mail-config.ui.h:72
+#: ../src/mail/mail-config.ui.h:74
 msgid "Send account overrides"
 msgstr "Lähetystilin ohitukset"
 
-#: ../src/mail/mail-config.ui.h:73
+#: ../src/mail/mail-config.ui.h:75
 msgid ""
 "Assign which account should be used as a send account for respective folders or "
 "recipients, an override for usual send account detection. List of recipients can "
@@ -19250,243 +19498,243 @@ msgstr ""
 "havaitsemisen. Vastaanottajaluettelo voi sisältää vaillinaisia osoitteita tai "
 "nimiä. Nimi- ja osoitekohtia vertaillaan erikseen."
 
-#: ../src/mail/mail-config.ui.h:74
+#: ../src/mail/mail-config.ui.h:76
 msgid "_Folder override has precedence over Recipient override"
 msgstr "_Kansiotason ohitus ylittää vastaanottajatason ohituksen"
 
-#: ../src/mail/mail-config.ui.h:75
+#: ../src/mail/mail-config.ui.h:77
 msgid "Send Account"
 msgstr "Lähetystili"
 
-#: ../src/mail/mail-config.ui.h:81 ../src/smime/gui/smime-ui.ui.h:27
+#: ../src/mail/mail-config.ui.h:83 ../src/smime/gui/smime-ui.ui.h:27
 msgid "a"
 msgstr "a"
 
-#: ../src/mail/mail-config.ui.h:82 ../src/smime/gui/smime-ui.ui.h:28
+#: ../src/mail/mail-config.ui.h:84 ../src/smime/gui/smime-ui.ui.h:28
 msgid "b"
 msgstr "b"
 
-#: ../src/mail/mail-config.ui.h:83
+#: ../src/mail/mail-config.ui.h:85
 msgid "Start up"
 msgstr "Käynnistys"
 
-#: ../src/mail/mail-config.ui.h:84
+#: ../src/mail/mail-config.ui.h:86
 msgid "Check for new _messages on start"
 msgstr "T_arkista uudet viestit käynnistyksen yhteydessä"
 
-#: ../src/mail/mail-config.ui.h:85
+#: ../src/mail/mail-config.ui.h:87
 msgid "Check for new messa_ges in all active accounts"
 msgstr "_Tarkista uudet viestit kaikilta aktiivisilta tileiltä"
 
-#: ../src/mail/mail-config.ui.h:86
+#: ../src/mail/mail-config.ui.h:88
 msgid "Message Display"
 msgstr "Viestin näyttäminen"
 
-#: ../src/mail/mail-config.ui.h:87
+#: ../src/mail/mail-config.ui.h:89
 msgid "_Use the same fonts as other applications"
 msgstr "Käytä samoja _fontteja kuin muut ohjelmat"
 
-#: ../src/mail/mail-config.ui.h:88
+#: ../src/mail/mail-config.ui.h:90
 msgid "S_tandard Font:"
 msgstr "_Oletusfontti:"
 
-#: ../src/mail/mail-config.ui.h:89
+#: ../src/mail/mail-config.ui.h:91
 msgid "Select HTML fixed width font"
 msgstr "Valitse HTML-viestin tasalevyinen fontti"
 
-#: ../src/mail/mail-config.ui.h:90
+#: ../src/mail/mail-config.ui.h:92
 msgid "Select HTML variable width font"
 msgstr "Valitse HTML-viestin vaihtuvalevyinen fontti"
 
-#: ../src/mail/mail-config.ui.h:91
+#: ../src/mail/mail-config.ui.h:93
 msgid "Fix_ed Width Font:"
 msgstr "_Tasalevyinen fontti:"
 
-#: ../src/mail/mail-config.ui.h:92
+#: ../src/mail/mail-config.ui.h:94
 msgid "_Mark messages as read after"
 msgstr "Merkitse vie_stit luetuiksi viiveellä"
 
-#: ../src/mail/mail-config.ui.h:94
+#: ../src/mail/mail-config.ui.h:96
 msgid "Highlight _quotations with"
 msgstr "_Lainausten korostukseen käytetty väri"
 
-#: ../src/mail/mail-config.ui.h:95
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:64
+#: ../src/mail/mail-config.ui.h:97
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:65
 msgid "Pick a color"
 msgstr "Valitse väri"
 
-#: ../src/mail/mail-config.ui.h:96
+#: ../src/mail/mail-config.ui.h:98
 msgid "color"
 msgstr "väri"
 
-#: ../src/mail/mail-config.ui.h:97
+#: ../src/mail/mail-config.ui.h:99
 msgid "Default character e_ncoding:"
 msgstr "Merkistön _oletuskoodaus:"
 
-#: ../src/mail/mail-config.ui.h:98
+#: ../src/mail/mail-config.ui.h:100
 msgid "Apply the same _view settings to all folders"
 msgstr "Käytä samoja _näkymäasetuksia kaikille kansioille"
 
-#: ../src/mail/mail-config.ui.h:99
+#: ../src/mail/mail-config.ui.h:101
 msgid "F_all back to threading messages by subject"
 msgstr "Palaa viestien säikeistämiseen _aiheen perusteella"
 
-#: ../src/mail/mail-config.ui.h:100
+#: ../src/mail/mail-config.ui.h:102
 msgid "Delete Mail"
 msgstr "Sähköpostien poistaminen"
 
-#: ../src/mail/mail-config.ui.h:101
+#: ../src/mail/mail-config.ui.h:103
 msgid "Empty _trash folders"
 msgstr "Tyhj_ennä roskakorikansiot"
 
-#: ../src/mail/mail-config.ui.h:102
+#: ../src/mail/mail-config.ui.h:104
 msgid "Confirm _when expunging a folder"
 msgstr "_Varmista viestien lopullinen siivous kansiosta"
 
-#: ../src/mail/mail-config.ui.h:103
+#: ../src/mail/mail-config.ui.h:105
 #, fuzzy
 #| msgid "Confirm _when expunging a folder"
 msgid "Confirm when emptying a _Junk folder"
 msgstr "_Varmista viestien lopullinen siivous kansiosta"
 
-#: ../src/mail/mail-config.ui.h:104
+#: ../src/mail/mail-config.ui.h:106
 #, fuzzy
 #| msgid "Enter the recipients of the message"
 msgid "Go to the previ_ous message after message deletion"
 msgstr "Syötä viestin vastaanottajat"
 
-#: ../src/mail/mail-config.ui.h:105
+#: ../src/mail/mail-config.ui.h:107
 msgid "Archive Mail"
 msgstr "Arkistoi viestit"
 
-#: ../src/mail/mail-config.ui.h:106
+#: ../src/mail/mail-config.ui.h:108
 msgid "Archive folder to use for On This Computer messages"
 msgstr ""
 
-#: ../src/mail/mail-config.ui.h:107
+#: ../src/mail/mail-config.ui.h:109
 msgid "On This Computer A_rchive folder:"
 msgstr "Arkistointikansio t_ällä tietokoneella:"
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../src/mail/mail-config.ui.h:109
+#: ../src/mail/mail-config.ui.h:111
 msgid "_Show animated images"
 msgstr "N_äytä animoidut kuvat"
 
-#: ../src/mail/mail-config.ui.h:110
+#: ../src/mail/mail-config.ui.h:112
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr "_Kysy vahvistus HTML-viesteistä henkilöille, jotka eivät niitä halua"
 
-#: ../src/mail/mail-config.ui.h:111
+#: ../src/mail/mail-config.ui.h:113
 msgid "Loading Remote Content"
 msgstr "Etäsisällön lataaminen"
 
-#: ../src/mail/mail-config.ui.h:112
+#: ../src/mail/mail-config.ui.h:114
 msgid "_Never load remote content from the Internet"
 msgstr "_Älä koskaan lataa etäsisältöä verkosta"
 
-#: ../src/mail/mail-config.ui.h:113
+#: ../src/mail/mail-config.ui.h:115
 msgid "_Load remote content only in messages from contacts"
 msgstr "_Lataa viestin etäsisältö vain yhteystietojen lähettämissä viesteissä"
 
-#: ../src/mail/mail-config.ui.h:114
+#: ../src/mail/mail-config.ui.h:116
 msgid "_Always load remote content from the Internet"
 msgstr "Lataa _aina etäsisältö verkosta"
 
-#: ../src/mail/mail-config.ui.h:115
+#: ../src/mail/mail-config.ui.h:117
 msgid "Notify about _missing remote content in the message preview"
 msgstr "_Huomauta puuttuvasta etäsisällöstä viestien esikatselussa"
 
-#: ../src/mail/mail-config.ui.h:116
+#: ../src/mail/mail-config.ui.h:118
 msgid "Add"
 msgstr "Lisää"
 
-#: ../src/mail/mail-config.ui.h:117
+#: ../src/mail/mail-config.ui.h:119
 msgid "Remove"
 msgstr "Poista"
 
-#: ../src/mail/mail-config.ui.h:118
+#: ../src/mail/mail-config.ui.h:120
 msgid "Allow for sites:"
 msgstr "Salli sivustoille:"
 
-#: ../src/mail/mail-config.ui.h:119
+#: ../src/mail/mail-config.ui.h:121
 msgid "Allow for senders:"
 msgstr "Salli lähettäjille:"
 
-#: ../src/mail/mail-config.ui.h:120
+#: ../src/mail/mail-config.ui.h:122
 msgid "HTML Messages"
 msgstr "HTML-viestit"
 
-#: ../src/mail/mail-config.ui.h:122
+#: ../src/mail/mail-config.ui.h:124
 msgid "Sender Photograph"
 msgstr "Lähettäjän valokuva"
 
-#: ../src/mail/mail-config.ui.h:123
+#: ../src/mail/mail-config.ui.h:125
 msgid "_Show the photograph of sender in the message preview"
 msgstr "_Näytä lähettäjän valokuva sähköpostin esikatselussa"
 
-#: ../src/mail/mail-config.ui.h:124
+#: ../src/mail/mail-config.ui.h:126
 msgid "Search gra_vatar.com for the photograph of sender"
 msgstr "Etsi lähettäjän kuvaa _gravatar.comista"
 
-#: ../src/mail/mail-config.ui.h:125
+#: ../src/mail/mail-config.ui.h:127
 msgid "Displayed Message Headers"
 msgstr "Näytettävät viestin otsakkeet"
 
-#: ../src/mail/mail-config.ui.h:126
+#: ../src/mail/mail-config.ui.h:128
 #, fuzzy
 #| msgid "Show deleted messages in the message-list"
 msgid "Show _full mail addresses in message preview"
 msgstr "Näytä poistetut viestit viestiluettelossa"
 
-#: ../src/mail/mail-config.ui.h:127
+#: ../src/mail/mail-config.ui.h:129
 msgid "Mail Headers Table"
 msgstr "Sähköposti otsikkotaulu"
 
-#: ../src/mail/mail-config.ui.h:128
+#: ../src/mail/mail-config.ui.h:130
 msgid "Re_set"
 msgstr ""
 
-#: ../src/mail/mail-config.ui.h:129
+#: ../src/mail/mail-config.ui.h:131
 #: ../src/modules/addressbook/autocompletion-config.c:118
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:45
 msgid "Date/Time Format"
 msgstr "Päiväys/aika -muotoilu"
 
-#: ../src/mail/mail-config.ui.h:131
+#: ../src/mail/mail-config.ui.h:133
 msgid "Check incoming _messages for junk"
 msgstr "Etsi roskapostia _saapuvasta viesteistä"
 
-#: ../src/mail/mail-config.ui.h:132
+#: ../src/mail/mail-config.ui.h:134
 msgid "_Delete junk messages"
 msgstr "Poista roskapostivi_estit"
 
-#: ../src/mail/mail-config.ui.h:133
+#: ../src/mail/mail-config.ui.h:135
 msgid "Junk Test Options"
 msgstr "Roskapostitestaus"
 
-#: ../src/mail/mail-config.ui.h:134
+#: ../src/mail/mail-config.ui.h:136
 msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr "Älä merkitse viestejä _roskapostiksi, jos lähettäjä on osoitekirjassa"
 
-#: ../src/mail/mail-config.ui.h:135
+#: ../src/mail/mail-config.ui.h:137
 msgid "_Lookup in local address book only"
 msgstr "_Etsi vain paikallisesta osoitekirjasta"
 
-#: ../src/mail/mail-config.ui.h:136
+#: ../src/mail/mail-config.ui.h:138
 msgid "Check cu_stom headers for junk"
 msgstr "Käytä _omia roskapostiotsakkeita"
 
-#: ../src/mail/mail-config.ui.h:138
-#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:302
-#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:245
+#: ../src/mail/mail-config.ui.h:140
+#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:303
+#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:246
 msgid "No encryption"
 msgstr "Ei salausta"
 
-#: ../src/mail/mail-config.ui.h:139
+#: ../src/mail/mail-config.ui.h:141
 msgid "TLS encryption"
 msgstr "TLS-salattu"
 
-#: ../src/mail/mail-config.ui.h:140
+#: ../src/mail/mail-config.ui.h:142
 msgid "SSL encryption"
 msgstr "SSL-salattu"
 
@@ -19774,7 +20022,7 @@ msgid ""
 msgstr "Haluatko varmasti poistaa kaikki poistetut viestit kaikista kansioista?"
 
 #: ../src/mail/mail.error.xml.h:42
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1454
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1540
 msgid "_Empty Trash"
 msgstr "_Tyhjennä roskakori"
 
@@ -20194,152 +20442,158 @@ msgid "In Current _Folder Only"
 msgstr "Vain nykyisessä _kansiossa"
 
 #: ../src/mail/mail.error.xml.h:141
+#, fuzzy
+#| msgid "In Current _Folder Only"
+msgid "_Always In Current Folder Only"
+msgstr "Vain nykyisessä _kansiossa"
+
+#: ../src/mail/mail.error.xml.h:142
 msgid "Should Evolution close this window when replying or forwarding?"
 msgstr ""
 "Pitäisikö Evolutionin sulkea tämä ikkuna vastatessa tai lähettäessä edelleen?"
 
-#: ../src/mail/mail.error.xml.h:142
+#: ../src/mail/mail.error.xml.h:143
 msgid "_Yes, Always"
 msgstr "_Kyllä, aina"
 
-#: ../src/mail/mail.error.xml.h:143
+#: ../src/mail/mail.error.xml.h:144
 msgid "_No, Never"
 msgstr "Ei, ei koskaan"
 
-#: ../src/mail/mail.error.xml.h:144
+#: ../src/mail/mail.error.xml.h:145
 #, fuzzy
 #| msgid "Copying folder %s"
 msgid "Copy folder in folder tree."
 msgstr "Kopioidaan kansiota %s"
 
-#: ../src/mail/mail.error.xml.h:145
+#: ../src/mail/mail.error.xml.h:146
 msgid "Are you sure you want to copy folder “{0}” to folder “{1}”?"
 msgstr "Haluatko varmasti kopioida kansion “{0}” kansioon “{1}”?"
 
-#: ../src/mail/mail.error.xml.h:147
+#: ../src/mail/mail.error.xml.h:148
 msgid "Do _not copy"
 msgstr "Älä ko_pioi"
 
-#: ../src/mail/mail.error.xml.h:148
+#: ../src/mail/mail.error.xml.h:149
 msgid "_Always copy"
 msgstr "_Kopioi aina"
 
-#: ../src/mail/mail.error.xml.h:149
+#: ../src/mail/mail.error.xml.h:150
 msgid "N_ever copy"
 msgstr "Ä_lä kopioi koskaan"
 
-#: ../src/mail/mail.error.xml.h:150
+#: ../src/mail/mail.error.xml.h:151
 #, fuzzy
 #| msgid "Moving folder %s"
 msgid "Move folder in folder tree."
 msgstr "Siirretään kansiota %s"
 
-#: ../src/mail/mail.error.xml.h:151
+#: ../src/mail/mail.error.xml.h:152
 msgid "Are you sure you want to to move folder “{0}” to folder “{1}”?"
 msgstr "Haluatko varmasti siirtää kansion “{0}” kansioon “{1}”?"
 
-#: ../src/mail/mail.error.xml.h:153
+#: ../src/mail/mail.error.xml.h:154
 msgid "Do _not move"
 msgstr "Ä_lä siirrä"
 
-#: ../src/mail/mail.error.xml.h:154
+#: ../src/mail/mail.error.xml.h:155
 msgid "_Always move"
 msgstr "_Siirrä aina"
 
-#: ../src/mail/mail.error.xml.h:155
+#: ../src/mail/mail.error.xml.h:156
 msgid "N_ever move"
 msgstr "_Älä siirrä koskaan"
 
-#: ../src/mail/mail.error.xml.h:156
+#: ../src/mail/mail.error.xml.h:157
 msgid ""
 "This message cannot be sent because the account you chose to send with is not "
 "enabled"
 msgstr ""
 "Viestiä ei voi lähettää, koska viestin lähetykseen valitsemasi tili ei ole käytössä"
 
-#: ../src/mail/mail.error.xml.h:157
+#: ../src/mail/mail.error.xml.h:158
 msgid "Please enable the account or send using another account."
 msgstr "Ota tili käyttöön tai lähetä käyttäen toista tiliä."
 
-#: ../src/mail/mail.error.xml.h:158
+#: ../src/mail/mail.error.xml.h:159
 msgid "This message cannot be sent because there is no mail account configured"
 msgstr "Tätä viestiä ei voi lähettää, koska et ole määritellyt sähköpostitiliä"
 
-#: ../src/mail/mail.error.xml.h:159
+#: ../src/mail/mail.error.xml.h:160
 msgid ""
 "There had not been found any active mail account to send the message. Create or "
 "enable one first, please."
 msgstr ""
 
-#: ../src/mail/mail.error.xml.h:160
+#: ../src/mail/mail.error.xml.h:161
 msgid "Mail Deletion Failed"
 msgstr "Sähköpostin poisto epäonnistui"
 
-#: ../src/mail/mail.error.xml.h:161
+#: ../src/mail/mail.error.xml.h:162
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "Oikeutesi eivät riitä tämän sähköpostin poistamiseen."
 
-#: ../src/mail/mail.error.xml.h:162
+#: ../src/mail/mail.error.xml.h:163
 #, fuzzy
 #| msgid "\"Check Junk\" Failed"
 msgid "“Check Junk” Failed"
 msgstr "”Etsi roskapostia” epäonnistui"
 
-#: ../src/mail/mail.error.xml.h:163
+#: ../src/mail/mail.error.xml.h:164
 #, fuzzy
 #| msgid "\"Report Junk\" Failed"
 msgid "“Report Junk” Failed"
 msgstr "”Ilmoita roskapostiksi” epäonnistui"
 
-#: ../src/mail/mail.error.xml.h:164
+#: ../src/mail/mail.error.xml.h:165
 #, fuzzy
 #| msgid "\"Report Not Junk\" Failed"
 msgid "“Report Not Junk” Failed"
 msgstr "”Ilmoita ei-roskapostiksi” epäonnistui"
 
-#: ../src/mail/mail.error.xml.h:165
+#: ../src/mail/mail.error.xml.h:166
 msgid "Remove duplicate messages?"
 msgstr "Poistetaanko viestien kaksoiskappaleet?"
 
-#: ../src/mail/mail.error.xml.h:166
+#: ../src/mail/mail.error.xml.h:167
 msgid "No duplicate messages found."
 msgstr "Kaksoiskappaleita ei löytynyt."
 
 #. Translators: {0} is replaced with a folder name
-#: ../src/mail/mail.error.xml.h:168
+#: ../src/mail/mail.error.xml.h:169
 #, fuzzy
 #| msgid "Folder '{0}' doesn't contain any duplicate message."
 msgid "Folder “{0}” doesn’t contain any duplicate message."
 msgstr "Kansio '{0}' ei sisällä viestien kaksoiskappaleita."
 
-#: ../src/mail/mail.error.xml.h:169
+#: ../src/mail/mail.error.xml.h:170
 msgid "Failed to connect account “{0}”."
 msgstr "Yhteys tiliin “{0}” epäonnistui."
 
-#: ../src/mail/mail.error.xml.h:170
+#: ../src/mail/mail.error.xml.h:171
 #, fuzzy
 #| msgid "Could not save to autosave file &quot;{0}&quot;."
 msgid "Failed to disconnect account “{0}”."
 msgstr "Varmuuskopiotiedostoa &quot;{0}&quot; ei voi tallentaa."
 
-#: ../src/mail/mail.error.xml.h:171
+#: ../src/mail/mail.error.xml.h:172
 #, fuzzy
 msgid "Failed to unsubscribe from folder “{0}”."
 msgstr "Perutaanko todella kansion \"%s\" tilaus?"
 
-#: ../src/mail/mail.error.xml.h:172
+#: ../src/mail/mail.error.xml.h:173
 msgid "Unable to retrieve message."
 msgstr "Viestin nouto ei onnistunut."
 
-#: ../src/mail/mail.error.xml.h:173
+#: ../src/mail/mail.error.xml.h:174
 msgid "{0}"
 msgstr "{0}"
 
-#: ../src/mail/mail.error.xml.h:174
+#: ../src/mail/mail.error.xml.h:175
 msgid "Message is not available in offline mode."
 msgstr "Viesti ei ole saatavilla yhteydettömässä tilassa."
 
-#: ../src/mail/mail.error.xml.h:175
+#: ../src/mail/mail.error.xml.h:176
 msgid ""
 "This can be due to the message not being downloaded yet. The folder, or the "
 "account, can be marked for offline synchronization. Then, once the account is "
@@ -20348,40 +20602,40 @@ msgid ""
 "offline mode."
 msgstr ""
 
-#: ../src/mail/mail.error.xml.h:176
+#: ../src/mail/mail.error.xml.h:177
 msgid "Failed to open folder."
 msgstr "Kansion avaus epäonnistui."
 
-#: ../src/mail/mail.error.xml.h:178
+#: ../src/mail/mail.error.xml.h:179
 msgid "Failed to find duplicate messages."
 msgstr "VIestin kaksoiskappaleiden etsiminen epäonnistui."
 
-#: ../src/mail/mail.error.xml.h:179
+#: ../src/mail/mail.error.xml.h:180
 msgid "Failed to retrieve messages."
 msgstr "Viestien nouto epäonnistui."
 
-#: ../src/mail/mail.error.xml.h:180
+#: ../src/mail/mail.error.xml.h:181
 msgid "Failed to mark messages as read."
 msgstr "Viestien merkitseminen luetuiksi epäonnistui."
 
-#: ../src/mail/mail.error.xml.h:181
+#: ../src/mail/mail.error.xml.h:182
 msgid "Failed to remove attachments from messages."
 msgstr "Liitteiden poisto viesteistä epäonnistui."
 
-#: ../src/mail/mail.error.xml.h:182
+#: ../src/mail/mail.error.xml.h:183
 #, fuzzy
-msgid "Failed to download messages for offline viewing."
+msgid "Failed to download messages for offline viewing for account “{0}”."
 msgstr "_Nouda viestit yhteydettömään käyttöön"
 
-#: ../src/mail/mail.error.xml.h:183
+#: ../src/mail/mail.error.xml.h:184
 msgid "Failed to save messages to disk."
 msgstr "Viestien tallennus levylle epäonnistui."
 
-#: ../src/mail/mail.error.xml.h:184
+#: ../src/mail/mail.error.xml.h:185
 msgid "Hidden file is attached."
 msgstr "Piilotiedosto on liitetty."
 
-#: ../src/mail/mail.error.xml.h:185
+#: ../src/mail/mail.error.xml.h:186
 msgid ""
 "The attachment named {0} is a hidden file and may contain sensitive data. Please "
 "review it before sending."
@@ -20389,59 +20643,59 @@ msgstr ""
 "Liite nimeltä {0} on piilotiedosto, ja se saattaa sisältää arkaluontoista tietoa. "
 "Varmista tiedoston sisältö ennen lähettämistä."
 
-#: ../src/mail/mail.error.xml.h:186
+#: ../src/mail/mail.error.xml.h:187
 msgid "Printing failed."
 msgstr "Tulostus epäonnistui."
 
-#: ../src/mail/mail.error.xml.h:187
+#: ../src/mail/mail.error.xml.h:188
 msgid "The printer replied “{0}”."
 msgstr "Tulostimen vastaus: “{0}”."
 
-#: ../src/mail/mail.error.xml.h:188
+#: ../src/mail/mail.error.xml.h:189
 #, fuzzy
 #| msgid "Could not open destination"
 msgid "Could not perform this operation on {0}."
 msgstr "Kohdetta ei voi avata"
 
-#: ../src/mail/mail.error.xml.h:189
+#: ../src/mail/mail.error.xml.h:190
 msgid "You must be working online to complete this operation."
 msgstr ""
 "Verkkoyhteyden tulee olla muodostettu, jotta tämä toimenpide on mahdollista "
 "suorittaa."
 
-#: ../src/mail/mail.error.xml.h:190
+#: ../src/mail/mail.error.xml.h:191
 msgid "Message from “{0}” account:"
 msgstr "Viesti “{0}”-tililtä:"
 
-#: ../src/mail/mail.error.xml.h:191
+#: ../src/mail/mail.error.xml.h:192
 #, fuzzy
 #| msgid "Found the appointment in the calendar '%s'"
 msgid "Failed to mark thread to be ignored in folder “{0}”"
 msgstr "Tapaaminen löytyi kalenterista \"%s\""
 
-#: ../src/mail/mail.error.xml.h:192
+#: ../src/mail/mail.error.xml.h:193
 #, fuzzy
 #| msgid "Found the appointment in the calendar '%s'"
 msgid "Failed to unmark thread from being ignored in folder “{0}”"
 msgstr "Tapaaminen löytyi kalenterista \"%s\""
 
-#: ../src/mail/mail.error.xml.h:193
+#: ../src/mail/mail.error.xml.h:194
 #, fuzzy
 #| msgid "Found the appointment in the calendar '%s'"
 msgid "Failed to mark subthread to be ignored in folder “{0}”"
 msgstr "Tapaaminen löytyi kalenterista \"%s\""
 
-#: ../src/mail/mail.error.xml.h:194
+#: ../src/mail/mail.error.xml.h:195
 #, fuzzy
 #| msgid "Found the appointment in the calendar '%s'"
 msgid "Failed to unmark subthread from being ignored in folder “{0}”"
 msgstr "Tapaaminen löytyi kalenterista \"%s\""
 
-#: ../src/mail/mail.error.xml.h:195
+#: ../src/mail/mail.error.xml.h:196
 msgid "Remote content download had been blocked for this message."
 msgstr "Etäsisällön lataaminen on estetty tämän viestin kohdalla."
 
-#: ../src/mail/mail.error.xml.h:196
+#: ../src/mail/mail.error.xml.h:197
 msgid ""
 "You can download remote content manually, or set to remember to download remote "
 "content for this sender or used sites."
@@ -20450,67 +20704,67 @@ msgstr ""
 "tämän lähettäjän tai sivustoston perusteella."
 
 #. Translators: This constructs a string like "Follow-up, Completed on Tuesday, January 13, 2009"
-#: ../src/mail/mail.error.xml.h:198
+#: ../src/mail/mail.error.xml.h:199
 #, fuzzy
 #| msgid " (Completed "
 msgid "{0}, Completed on {1}"
 msgstr " (Valmis "
 
 #. Translators: This constructs a string like "Follow-up by Tuesday, January 13, 2009"
-#: ../src/mail/mail.error.xml.h:200
+#: ../src/mail/mail.error.xml.h:201
 msgid "{0} by {1}"
 msgstr ""
 
 #. Translators: This constructs a string like "Overdue: Follow-up by Tuesday, January 13, 2009"
-#: ../src/mail/mail.error.xml.h:202
+#: ../src/mail/mail.error.xml.h:203
 msgid "Overdue: {0} by {1}"
 msgstr ""
 
-#: ../src/mail/mail.error.xml.h:204
+#: ../src/mail/mail.error.xml.h:205
 #, fuzzy
 #| msgid "This signature has been changed, but has not been saved."
 msgid "This message note has been changed, but has not been saved."
 msgstr "Tämä allekirjoitus on muuttunut, mutta sitä ei ole tallennettu."
 
 #. Translators: {0} is the name of the folder where the delete of the message note failed.
-#: ../src/mail/mail.error.xml.h:207
+#: ../src/mail/mail.error.xml.h:208
 #, fuzzy
 #| msgid "Found the appointment in the calendar '%s'"
 msgid "Failed to delete message note in folder “{0}”"
 msgstr "Tapaaminen löytyi kalenterista \"%s\""
 
 #. Translators: {0} is the name of the folder where the store of the message note failed.
-#: ../src/mail/mail.error.xml.h:209
+#: ../src/mail/mail.error.xml.h:210
 #, fuzzy
 #| msgid "Found the appointment in the calendar '%s'"
 msgid "Failed to store message note in folder “{0}”"
 msgstr "Tapaaminen löytyi kalenterista \"%s\""
 
-#: ../src/mail/mail.error.xml.h:210
+#: ../src/mail/mail.error.xml.h:211
 #, fuzzy
 #| msgid "Search for text in the body of the displayed message"
 msgid "Something has gone wrong when displaying the message"
 msgstr "Etsiä tekstiä näytetyn viestin rungosta"
 
-#: ../src/mail/mail.error.xml.h:211
+#: ../src/mail/mail.error.xml.h:212
 msgid ""
 "A WebKitWebProcess crashed when displaying the message. You can try again by "
 "moving to another message and back. If the issue persists, please file a bug "
 "report in GNOME Gitlab."
 msgstr ""
 
-#: ../src/mail/mail.error.xml.h:212
+#: ../src/mail/mail.error.xml.h:213
 msgid "Something has gone wrong when displaying the signature"
 msgstr ""
 
-#: ../src/mail/mail.error.xml.h:213
+#: ../src/mail/mail.error.xml.h:214
 msgid ""
 "A WebKitWebProcess crashed when displaying the signature. You can try again by "
 "moving to another signature and back. If the issue persists, please file a bug "
 "report in GNOME Gitlab."
 msgstr ""
 
-#: ../src/mail/mail.error.xml.h:214
+#: ../src/mail/mail.error.xml.h:215
 #, fuzzy
 #| msgid ""
 #| "Are you sure you want to permanently remove all the deleted messages in all "
@@ -20518,72 +20772,72 @@ msgstr ""
 msgid "Are you sure you want to delete all the messages in the Junk folder?"
 msgstr "Haluatko varmasti poistaa kaikki poistetut viestit kaikista kansioista?"
 
-#: ../src/mail/mail.error.xml.h:215
+#: ../src/mail/mail.error.xml.h:216
 msgid ""
 "These messages will be shown in the Trash folder, where they can be permanently "
 "deleted later."
 msgstr ""
 
-#: ../src/mail/mail.error.xml.h:216
+#: ../src/mail/mail.error.xml.h:217
 #, fuzzy
 #| msgid "_Not Junk"
 msgid "_Empty Junk"
 msgstr "_Ei roskapostia"
 
-#: ../src/mail/mail.error.xml.h:217
+#: ../src/mail/mail.error.xml.h:218
 #, fuzzy
 #| msgid "Could not read signature file &quot;{0}&quot;."
 msgid "Failed to empty Junk folder “{0}”"
 msgstr "Allekirjoitustiedostoa &quot;{0}&quot; ei voi lukea."
 
-#: ../src/mail/mail-send-recv.c:192
+#: ../src/mail/mail-send-recv.c:193
 msgid "Canceling..."
 msgstr "Perutaan..."
 
-#: ../src/mail/mail-send-recv.c:580
+#: ../src/mail/mail-send-recv.c:610
 msgid "Edit Message"
 msgstr "Muokkaa viestiä"
 
-#: ../src/mail/mail-send-recv.c:585
+#: ../src/mail/mail-send-recv.c:615
 #, fuzzy
 #| msgid "Move to Folder"
 msgid "Open Outbox Folder"
 msgstr "Siirrä kansioon"
 
-#: ../src/mail/mail-send-recv.c:738
+#: ../src/mail/mail-send-recv.c:768
 msgid "Send & Receive Mail"
 msgstr "Lähetä ja vastaanota postia"
 
-#: ../src/mail/mail-send-recv.c:752
+#: ../src/mail/mail-send-recv.c:782
 msgid "Cancel _All"
 msgstr "_Peruuta kaikki"
 
-#: ../src/mail/mail-send-recv.c:841 ../src/mail/mail-send-recv.c:1372
+#: ../src/mail/mail-send-recv.c:871 ../src/mail/mail-send-recv.c:1470
 msgid "Updating..."
 msgstr "Päivitetään..."
 
-#: ../src/mail/mail-send-recv.c:841 ../src/mail/mail-send-recv.c:922
+#: ../src/mail/mail-send-recv.c:871 ../src/mail/mail-send-recv.c:952
 msgid "Waiting..."
 msgstr "Odotetaan..."
 
-#: ../src/mail/mail-send-recv.c:1338
+#: ../src/mail/mail-send-recv.c:1436
 #, fuzzy, c-format
 #| msgid "Checking for new mail at '%s'"
 msgid "Checking for new mail at “%s”"
 msgstr "Tarkistetaan onko uusia viestejä palvelusta '%s'"
 
-#: ../src/mail/mail-send-recv.c:1565
+#: ../src/mail/mail-send-recv.c:1663
 #, c-format
 msgid "Deleting junk and expunging trash at “%s”"
 msgstr ""
 
-#: ../src/mail/mail-send-recv.c:1567
+#: ../src/mail/mail-send-recv.c:1665
 #, fuzzy, c-format
 #| msgid "Reconnecting to '%s'"
 msgid "Deleting junk at “%s”"
 msgstr "Yhdistetään uudelleen kohteeseen ”%s”"
 
-#: ../src/mail/mail-send-recv.c:1569
+#: ../src/mail/mail-send-recv.c:1667
 #, fuzzy, c-format
 #| msgid "Emptying trash in '%s'"
 msgid "Expunging trash at “%s”"
@@ -20641,54 +20895,54 @@ msgstr "Korkeampi"
 msgid "Highest"
 msgstr "Korkein"
 
-#: ../src/mail/message-list.c:479 ../src/mail/message-list.c:6751
+#: ../src/mail/message-list.c:479 ../src/mail/message-list.c:6690
 msgid "Generating message list"
 msgstr "Luodaan viestiluetteloa"
 
 #. strftime format of a time,
 #. * in 12-hour format, without seconds.
-#: ../src/mail/message-list.c:2120 ../src/modules/itip-formatter/itip-view.c:269
+#: ../src/mail/message-list.c:2154 ../src/modules/itip-formatter/itip-view.c:269
 msgid "Today %l:%M %p"
 msgstr "Tänään %l.%M %p"
 
-#: ../src/mail/message-list.c:2129
+#: ../src/mail/message-list.c:2163
 msgid "Yesterday %l:%M %p"
 msgstr "Eilen %l.%M %p"
 
-#: ../src/mail/message-list.c:2141
+#: ../src/mail/message-list.c:2175
 msgid "%a %l:%M %p"
 msgstr "%a %l.%M %p"
 
-#: ../src/mail/message-list.c:2149
+#: ../src/mail/message-list.c:2183
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l.%M %p"
 
-#: ../src/mail/message-list.c:2151
+#: ../src/mail/message-list.c:2185
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: ../src/mail/message-list.c:3191
+#: ../src/mail/message-list.c:3265
 msgid "Select all visible messages"
 msgstr "Valitse kaikki näkyvät viestit"
 
-#: ../src/mail/message-list.c:3936 ../src/mail/message-list.etspec.h:17
+#: ../src/mail/message-list.c:4010 ../src/mail/message-list.etspec.h:17
 msgid "Messages"
 msgstr "Viestit"
 
 #. default follow-up flag name to use when clicked in the message list column
-#: ../src/mail/message-list.c:5400
+#: ../src/mail/message-list.c:5559
 #, fuzzy
 msgid "Follow-up"
 msgstr "Lähetä edelleen"
 
-#: ../src/mail/message-list.c:6690
+#: ../src/mail/message-list.c:6629
 msgid ""
 "No message satisfies your search criteria. Change search criteria by selecting a "
 "new Show message filter from the drop down list above or by running a new search "
 "either by clearing it with Search→Clear menu item or by changing the query above."
 msgstr ""
 
-#: ../src/mail/message-list.c:6698
+#: ../src/mail/message-list.c:6637
 msgid "There are no messages in this folder."
 msgstr "Tässä kansiossa ei ole viestejä."
 
@@ -20749,32 +21003,32 @@ msgid "Subject or Addresses contains"
 msgstr "Aihe tai lähettäjät sisältävät"
 
 #: ../src/mail/searchtypes.xml.in.h:58
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1979
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2065
 msgid "Recipients contain"
 msgstr "Vastaanottajat sisältää"
 
 #: ../src/mail/searchtypes.xml.in.h:59
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1972
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2058
 msgid "Message contains"
 msgstr "Viesti sisältää"
 
 #: ../src/mail/searchtypes.xml.in.h:60
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1993
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2079
 msgid "Subject contains"
 msgstr "Otsikko sisältää"
 
 #: ../src/mail/searchtypes.xml.in.h:61
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1986
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2072
 msgid "Sender contains"
 msgstr "Lähettäjä sisältää"
 
 #: ../src/mail/searchtypes.xml.in.h:62
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1958
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2044
 msgid "Body contains"
 msgstr "Runko sisältää"
 
 #: ../src/mail/searchtypes.xml.in.h:63
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1965
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2051
 #, fuzzy
 #| msgid "Expression"
 msgid "Free form expression"
@@ -20831,16 +21085,12 @@ msgstr "Muistilappulistan ominaisuudet"
 msgid "Task List Properties"
 msgstr "Tehtävälistan ominaisuudet"
 
-#: ../src/modules/accounts-window/e-collection-wizard-page.c:75
-#: ../src/modules/accounts-window/e-collection-wizard-page.c:209
+#: ../src/modules/accounts-window/e-collection-wizard-page.c:80
+#: ../src/modules/accounts-window/e-collection-wizard-page.c:229
 #: ../src/modules/accounts-window/e-webdav-browser-page.c:174
 msgid "_Back"
 msgstr "_Takaisin"
 
-#: ../src/modules/accounts-window/e-collection-wizard-page.c:78
-msgid "_Finish"
-msgstr "_Valmis"
-
 #: ../src/modules/accounts-window/e-webdav-browser-page.c:195
 msgid "_Browse"
 msgstr "_Selaa"
@@ -21018,7 +21268,7 @@ msgstr "Näytä kartta, jossa on kaikki yhteystiedot valitusta osoitekirjasta"
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:1360
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:642
 #: ../src/modules/calendar/e-task-shell-view-actions.c:768
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1553
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1639
 msgid "_Rename..."
 msgstr "_Nimeä uudestaan..."
 
@@ -21099,7 +21349,7 @@ msgstr "T_oiminnot"
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1164
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:686
 #: ../src/modules/calendar/e-task-shell-view-actions.c:840
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1702
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1788
 msgid "_Preview"
 msgstr "_Esikatselu"
 
@@ -21134,7 +21384,7 @@ msgstr "Näytä yhteystiedon esikatseluruutu"
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1254
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:768
 #: ../src/modules/calendar/e-task-shell-view-actions.c:934
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1860
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1946
 msgid "_Classic View"
 msgstr "_Perinteinen näkymä"
 
@@ -21145,7 +21395,7 @@ msgstr "Näytä yhteystiedon esikatselu yhteystietoluettelon alla"
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1261
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:775
 #: ../src/modules/calendar/e-task-shell-view-actions.c:941
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1867
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1953
 msgid "_Vertical View"
 msgstr "_Pystysuuntainen näkymä"
 
@@ -21164,7 +21414,7 @@ msgstr "Täsmäämättömät"
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:1733
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:802
 #: ../src/modules/calendar/e-task-shell-view-actions.c:1010
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1951
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2037
 #: ../src/shell/e-shell-content.c:639
 msgid "Advanced Search"
 msgstr "Oma haku"
@@ -21251,40 +21501,40 @@ msgstr "Valitse palautettava varmuuskopiotiedosto"
 msgid "Restore from Backup"
 msgstr "Palauta varmuuskopiosta"
 
-#: ../src/modules/backup-restore/evolution-backup-restore.c:304
+#: ../src/modules/backup-restore/evolution-backup-restore.c:306
 msgid "Select name of the Evolution backup file"
 msgstr "Valitse Evolutionin varmuuskopiotiedoston nimi"
 
-#: ../src/modules/backup-restore/evolution-backup-restore.c:349
+#: ../src/modules/backup-restore/evolution-backup-restore.c:351
 msgid "_Restart Evolution after backup"
 msgstr "Käynnistä Evolution _uudestaan varmuuskopioinnin jälkeen"
 
-#: ../src/modules/backup-restore/evolution-backup-restore.c:384
+#: ../src/modules/backup-restore/evolution-backup-restore.c:386
 msgid "Re_start Evolution after restore"
 msgstr "Käynnistä Evolution _uudestaan palautuksen jälkeen"
 
-#: ../src/modules/backup-restore/evolution-backup-restore.c:426
+#: ../src/modules/backup-restore/evolution-backup-restore.c:428
 msgid "Select name of the Evolution backup file to restore"
 msgstr "Valitse palautettavan Evolutionin varmuuskopiotiedoston nimi"
 
-#: ../src/modules/backup-restore/evolution-backup-restore.c:435
+#: ../src/modules/backup-restore/evolution-backup-restore.c:437
 #, c-format
 msgid "Checking content of backup file “%s”, please wait..."
 msgstr "Tarkistetaan varmuuskopiotiedoston “%s” sisältöä, odota hetki..."
 
-#: ../src/modules/backup-restore/evolution-backup-restore.c:456
+#: ../src/modules/backup-restore/evolution-backup-restore.c:458
 msgid "_Back up Evolution Data..."
 msgstr "_Varmuuskopioi Evolutionin tiedot..."
 
-#: ../src/modules/backup-restore/evolution-backup-restore.c:458
+#: ../src/modules/backup-restore/evolution-backup-restore.c:460
 msgid "Back up Evolution data and settings to an archive file"
 msgstr "Varmuuskopioi Evolutionin tiedot ja asetukset arkistotiedostoon"
 
-#: ../src/modules/backup-restore/evolution-backup-restore.c:463
+#: ../src/modules/backup-restore/evolution-backup-restore.c:465
 msgid "R_estore Evolution Data..."
 msgstr "Palauta _Evolutionin tiedot..."
 
-#: ../src/modules/backup-restore/evolution-backup-restore.c:465
+#: ../src/modules/backup-restore/evolution-backup-restore.c:467
 msgid "Restore Evolution data and settings from an archive file"
 msgstr "Palauta Evolutionin tietoja ja asetuksia arkistotiedostosta"
 
@@ -21477,8 +21727,8 @@ msgstr "Valitse osoitekirja"
 
 #: ../src/modules/book-config-carddav/evolution-book-config-carddav.c:250
 #: ../src/modules/book-config-carddav/evolution-book-config-carddav.c:263
-#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:293
-#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:309
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:294
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:310
 #: ../src/modules/cal-config-webcal/evolution-cal-config-webcal.c:128
 msgid "URL:"
 msgstr "URL:"
@@ -21492,7 +21742,7 @@ msgid "Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr "Vältä IfMatch-komentoa (vaaditaan Apache-versiolle < 2.2.8)"
 
 #: ../src/modules/book-config-carddav/evolution-book-config-carddav.c:336
-#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:425
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:426
 #: ../src/modules/cal-config-webcal/evolution-cal-config-webcal.c:185
 msgid "URL is not a valid http:// nor https:// URL"
 msgstr "Osoite ei ole kelvollinen http://- tai https://-osoite";
@@ -21501,8 +21751,8 @@ msgstr "Osoite ei ole kelvollinen http://- tai https://-osoite";
 #: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:1069
 #: ../src/modules/cal-config-google/e-cal-config-google.c:190
 #: ../src/modules/cal-config-google/e-cal-config-gtasks.c:115
-#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:434
-#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:469
+#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:444
+#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:479
 msgid "User name cannot be empty"
 msgstr "Käyttäjätunnus ei voi olla tyhjä"
 
@@ -21541,8 +21791,8 @@ msgid "Port:"
 msgstr "Portti:"
 
 #: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:675
-#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:246
-#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:201
+#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:247
+#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:202
 msgid "Port number is not valid"
 msgstr "Portin numero ei ole kelvollinen"
 
@@ -21555,8 +21805,8 @@ msgid "Encryption:"
 msgstr "Salaus:"
 
 #: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:716
-#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:323
-#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:266
+#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:324
+#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:267
 msgid "Authentication"
 msgstr "Kirjautuminen"
 
@@ -21663,8 +21913,8 @@ msgid "Browse until limit is reached"
 msgstr "Selaa kunnes raja tulee vastaan"
 
 #: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:1054
-#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:415
-#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:451
+#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:425
+#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:461
 msgid "Server address cannot be empty"
 msgstr "Palvelimen osoite ei voi olla tyhjä"
 
@@ -21683,27 +21933,27 @@ msgstr "Valitse muistilappulista"
 msgid "Choose a Task List"
 msgstr "Valitse tehtävälista"
 
-#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:325
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:326
 msgid "Find Calendars"
 msgstr "Etsi kalentereja"
 
-#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:328
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:329
 #, fuzzy
 #| msgid "Memo List"
 msgid "Find Memo Lists"
 msgstr "Muistilappulista"
 
-#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:331
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:332
 #, fuzzy
 #| msgid "Task List"
 msgid "Find Task Lists"
 msgstr "Tehtävälista"
 
-#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:350
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:351
 msgid "Email:"
 msgstr "Sähköposti:"
 
-#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:355
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:356
 msgid "Server handles meeting invitations"
 msgstr "Palvelin hallitsee tapaamiskutsuja"
 
@@ -21756,12 +22006,6 @@ msgctxt "locale-metric"
 msgid "default:mm"
 msgstr "Oletukset"
 
-#: ../src/modules/cal-config-weather/evolution-cal-config-weather.c:249
-#: ../src/modules/itip-formatter/itip-view.c:1682
-#: ../src/modules/itip-formatter/itip-view.c:1793
-msgid "Location:"
-msgstr "Sijainti:"
-
 #. Translators: This is the temperature in degrees
 #. * Fahrenheit. (\302\260 is U+00B0 DEGREE SIGN)
 #: ../src/modules/cal-config-weather/evolution-cal-config-weather.c:259
@@ -21840,51 +22084,51 @@ msgstr "_Tuo tehtäviin"
 msgid "I_mport to Task List"
 msgstr "_Tuo tehtäviin"
 
-#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:558
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:569
 #, fuzzy, c-format
 #| msgid "Copying an event into the calendar %s"
 msgid "Copying an event into the calendar “%s”"
 msgstr "Kopioidaan tapahtumaa kalenteriin %s"
 
-#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:559
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:570
 #, fuzzy, c-format
 #| msgid "Moving an event into the calendar %s"
 msgid "Moving an event into the calendar “%s”"
 msgstr "Siirretään tapahtumaa kalenteriin %s"
 
-#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:564
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:575
 #, fuzzy, c-format
 #| msgid "Delete memo list '{0}'?"
 msgid "Copying a memo into the memo list “%s”"
 msgstr "Poistetaanko muistilappulista \"{0}\"?"
 
-#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:565
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:576
 #, fuzzy, c-format
 #| msgid "Delete memo list '{0}'?"
 msgid "Moving a memo into the memo list “%s”"
 msgstr "Poistetaanko muistilappulista \"{0}\"?"
 
-#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:570
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:581
 #, fuzzy, c-format
 #| msgid "Show task preview below the task list"
 msgid "Copying a task into the task list “%s”"
 msgstr "Näytä tehtävien esikatselu tehtävälistan alla"
 
-#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:571
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:582
 #, fuzzy, c-format
 #| msgid "Show task preview below the task list"
 msgid "Moving a task into the task list “%s”"
 msgstr "Näytä tehtävien esikatselu tehtävälistan alla"
 
-#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:688
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:699
 msgid "Calendar Selector"
 msgstr "Kalenterin valinta"
 
-#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:694
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:705
 msgid "Memo List Selector"
 msgstr "Muistilappuluetteloiden valitsin"
 
-#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:699
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:710
 msgid "Task List Selector"
 msgstr "Tehtävienluetteloiden valitsin"
 
@@ -21920,11 +22164,11 @@ msgstr "Ristiriitaisuuksien haku"
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Valitse kalenterit, joista etsitään päällekkäisiä kokouksia"
 
-#: ../src/modules/calendar/e-calendar-preferences.c:1123
+#: ../src/modules/calendar/e-calendar-preferences.c:1129
 msgid "Ti_me and date:"
 msgstr "_Päiväys ja aika:"
 
-#: ../src/modules/calendar/e-calendar-preferences.c:1124
+#: ../src/modules/calendar/e-calendar-preferences.c:1130
 msgid "_Date only:"
 msgstr "_Vain päiväys:"
 
@@ -22118,97 +22362,107 @@ msgid "Allo_w direct edit of event Summary"
 msgstr ""
 
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:59
+msgid "Hi_de cancelled events"
+msgstr "_Piilota perutut tapahtumat"
+
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:60
 msgid "Alerts"
 msgstr "Hälytykset"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:60
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:61
 msgid "_Ask for confirmation when deleting items"
 msgstr "Pyydä _vahvistusta poistettaessa"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:61
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:62
 msgid "Display"
 msgstr "Näytä"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:63
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:64
 msgid "Highlight t_asks due today"
 msgstr "Korosta _tänään erääntyvät tehtävät"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:65
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:66
 msgid "Highlight _overdue tasks"
 msgstr "Korosta _eräpäivän ylittäneet tehtävät"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:66
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:67
 msgid "_Hide completed tasks after"
 msgstr "Piilota _poistetut viestit kun on kulunut"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:67
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:68
 msgid "Hid_e cancelled tasks"
 msgstr "Piilota _perutut tehtävät"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:68
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:69
 #, fuzzy
 #| msgid "_To Do"
 msgid "To Do bar"
 msgstr "Te_htävää"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:69
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:70
 msgid "Show Tasks without _Due date"
 msgstr ""
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:72
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:73
 msgid "Display reminders in _notification area only"
 msgstr "Näytä muistutukset vain _ilmoitusalueella"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:73
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:74
 #, fuzzy
 #| msgid "Display reminders in _notification area only"
 msgid "Keep reminder notification _window always on top"
 msgstr "Näytä muistutukset vain _ilmoitusalueella"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:74
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:75
 msgid "Display reminders for completed _tasks"
 msgstr "Poista muistutukset _valmistuneista tehtävistä"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:75
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:76
 msgid "Display reminders for _past events"
 msgstr "Näytä _muistutukset menneistä tapahtumista"
 
 #. This is the first half of a user preference. "Set default reminder [time-period] before every new 
appointment"
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:77
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:78
 msgid "Set _default reminder"
 msgstr "_Aseta oletusmuistutus"
 
 #. This is the last half of a user preference. "Set default reminder [time-period] before every new 
appointment"
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:79
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:80
 msgid "before every new appointment"
 msgstr "ennen jokaista uutta tapaamista"
 
 #. This is the first half of a user preference. "Show a reminder [time-period] before every 
anniversary/birthday"
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:81
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:82
 msgid "Show a _reminder"
 msgstr "Näytä _muistutus"
 
 #. This is the last half of a user preference. "Show a reminder [time-period] before every 
anniversary/birthday"
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:83
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:84
 msgid "before every anniversary/birthday"
 msgstr "ennen joka vuosipäivää ja syntymäpäivää"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:84
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:85
 #, fuzzy
 #| msgid "Select the calendars for reminder notification"
 msgid "Select the sources for reminder notification:"
 msgstr "Valitse kalenterit, joiden muistutuksista ilmoitetaan"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:88
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:89
 msgid "Default Free/Busy Server"
 msgstr "Oletus-vapaa/varattu-palvelin"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:91
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:92
 #, no-c-format
 msgid "%u and %d will be replaced by user and domain from the email address."
 msgstr "%u ja %d korvataan sähköpostiosoitteen käyttäjällä ja aluenimellä."
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:92
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:93
+msgid ""
+"Specify login user name as part of the URL in case the server requires "
+"authentication, like: https://USER example com/"
+msgstr ""
+
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:94
 msgid "Publishing Information"
 msgstr "Julkaisutiedot"
 
@@ -23075,7 +23329,7 @@ msgstr "LDAP-palvelin"
 msgid "Looking up LDAP server…"
 msgstr "Etsitään LDAP-palvelinta…"
 
-#: ../src/modules/config-lookup/e-srv-config-lookup.c:234
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:240
 msgid "Look up in SRV records"
 msgstr "Etsitään SRV-tietueita"
 
@@ -23527,7 +23781,7 @@ msgid "_Update Attendee Status"
 msgstr "_Päivitä läsnäolijan tila"
 
 #: ../src/modules/itip-formatter/itip-view.c:1241
-#: ../src/smime/gui/certificate-manager.c:1677
+#: ../src/smime/gui/certificate-manager.c:1661
 msgid "_Update"
 msgstr "_Päivitä"
 
@@ -23577,7 +23831,7 @@ msgid "Sa_ve"
 msgstr "_Tallenna"
 
 #: ../src/modules/itip-formatter/itip-view.c:3634
-#: ../src/modules/itip-formatter/itip-view.c:5199
+#: ../src/modules/itip-formatter/itip-view.c:5200
 msgid "Attendee status updated"
 msgstr "Läsnäolon tila päivitetty"
 
@@ -23659,87 +23913,87 @@ msgstr "Lähetetty kalenteriin “%s” hylättynä"
 msgid "Sent to calendar “%s” as cancelled"
 msgstr "Lähetetty kalenteriin “%s” peruttuna"
 
-#: ../src/modules/itip-formatter/itip-view.c:4879
-#: ../src/modules/itip-formatter/itip-view.c:5336
-#: ../src/modules/itip-formatter/itip-view.c:5439
+#: ../src/modules/itip-formatter/itip-view.c:4878
+#: ../src/modules/itip-formatter/itip-view.c:5337
+#: ../src/modules/itip-formatter/itip-view.c:5440
 msgid "Saving changes to the calendar. Please wait..."
 msgstr "Tallennetaan muutoksia kalenteriin, odota hetki..."
 
-#: ../src/modules/itip-formatter/itip-view.c:4931
+#: ../src/modules/itip-formatter/itip-view.c:4932
 msgid "Unable to parse item"
 msgstr "Kohdetta ei voi tulkita"
 
-#: ../src/modules/itip-formatter/itip-view.c:5123
+#: ../src/modules/itip-formatter/itip-view.c:5124
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Järjestäjä on poistanut valtuutuksen %s "
 
-#: ../src/modules/itip-formatter/itip-view.c:5140
+#: ../src/modules/itip-formatter/itip-view.c:5141
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Lähetettiin perumisilmoitus valtuutetulle"
 
-#: ../src/modules/itip-formatter/itip-view.c:5144
+#: ../src/modules/itip-formatter/itip-view.c:5145
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "Perumisilmoitusta ei voi lähettää valtuutetulle"
 
-#: ../src/modules/itip-formatter/itip-view.c:5191
+#: ../src/modules/itip-formatter/itip-view.c:5192
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Läsnäolijaa ei voi päivittää. %s"
 
-#: ../src/modules/itip-formatter/itip-view.c:5226
+#: ../src/modules/itip-formatter/itip-view.c:5227
 msgid "The meeting is invalid and cannot be updated"
 msgstr "Tapaaminen on virheellinen, eikä sitä voi päivittää"
 
-#: ../src/modules/itip-formatter/itip-view.c:5301
+#: ../src/modules/itip-formatter/itip-view.c:5302
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "Läsnäolon tilaa ei voi päivittää virheellisen tilan takia"
 
-#: ../src/modules/itip-formatter/itip-view.c:5372
-#: ../src/modules/itip-formatter/itip-view.c:5410
+#: ../src/modules/itip-formatter/itip-view.c:5373
+#: ../src/modules/itip-formatter/itip-view.c:5411
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "Läsnäolon tilaa ei voi päivittää, koska kohdetta ei enää ole olemassa"
 
-#: ../src/modules/itip-formatter/itip-view.c:5471
+#: ../src/modules/itip-formatter/itip-view.c:5472
 msgid "Meeting information sent"
 msgstr "Kokouksen tiedot lähetetty"
 
-#: ../src/modules/itip-formatter/itip-view.c:5476
+#: ../src/modules/itip-formatter/itip-view.c:5477
 msgid "Task information sent"
 msgstr "Tehtävän tiedot lähetetty"
 
-#: ../src/modules/itip-formatter/itip-view.c:5481
+#: ../src/modules/itip-formatter/itip-view.c:5482
 msgid "Memo information sent"
 msgstr "Muistilapun tiedot lähetetty"
 
-#: ../src/modules/itip-formatter/itip-view.c:5492
+#: ../src/modules/itip-formatter/itip-view.c:5493
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "Kokoustietoja ei voitu lähettää, koska kokousta ei löydy"
 
-#: ../src/modules/itip-formatter/itip-view.c:5497
+#: ../src/modules/itip-formatter/itip-view.c:5498
 msgid "Unable to send task information, the task does not exist"
 msgstr "Tehtävän tietoja ei voitu lähettää, koska tehtävää ei löydy"
 
-#: ../src/modules/itip-formatter/itip-view.c:5502
+#: ../src/modules/itip-formatter/itip-view.c:5503
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "Muistilapun tietoja ei voitu lähettää, koska muistilappua ei löydy"
 
 #. Translators: This is a default filename for a calendar.
-#: ../src/modules/itip-formatter/itip-view.c:5567
+#: ../src/modules/itip-formatter/itip-view.c:5568
 msgid "calendar.ics"
 msgstr "kalenteri.ics"
 
-#: ../src/modules/itip-formatter/itip-view.c:5572
+#: ../src/modules/itip-formatter/itip-view.c:5573
 msgid "Save Calendar"
 msgstr "Tallenna kalenteri"
 
-#: ../src/modules/itip-formatter/itip-view.c:5621
-#: ../src/modules/itip-formatter/itip-view.c:5634
+#: ../src/modules/itip-formatter/itip-view.c:5622
+#: ../src/modules/itip-formatter/itip-view.c:5635
 msgid "The calendar attached is not valid"
 msgstr "Liitetty kalenteri ei ole kelvollinen"
 
-#: ../src/modules/itip-formatter/itip-view.c:5622
-#: ../src/modules/itip-formatter/itip-view.c:5635
+#: ../src/modules/itip-formatter/itip-view.c:5623
+#: ../src/modules/itip-formatter/itip-view.c:5636
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -23747,15 +24001,15 @@ msgstr ""
 "Viesti väittää sisältävänsä kalenterin, mutta kalenteri ei ole kelvollinen "
 "iCalendar-tiedosto."
 
-#: ../src/modules/itip-formatter/itip-view.c:5677
-#: ../src/modules/itip-formatter/itip-view.c:5758
-#: ../src/modules/itip-formatter/itip-view.c:5854
+#: ../src/modules/itip-formatter/itip-view.c:5698
+#: ../src/modules/itip-formatter/itip-view.c:5779
+#: ../src/modules/itip-formatter/itip-view.c:5875
 msgid "The item in the calendar is not valid"
 msgstr "Kalenterin sisältö ei ole kelvollinen"
 
-#: ../src/modules/itip-formatter/itip-view.c:5678
-#: ../src/modules/itip-formatter/itip-view.c:5759
-#: ../src/modules/itip-formatter/itip-view.c:5855
+#: ../src/modules/itip-formatter/itip-view.c:5699
+#: ../src/modules/itip-formatter/itip-view.c:5780
+#: ../src/modules/itip-formatter/itip-view.c:5876
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, tasks or "
 "free/busy information"
@@ -23763,23 +24017,23 @@ msgstr ""
 "Viesti sisältää kalenterin, mutta kalenterissa ei ole tapahtumia, tehtäviä tai "
 "vapaa/varattu-tietoja."
 
-#: ../src/modules/itip-formatter/itip-view.c:5768
+#: ../src/modules/itip-formatter/itip-view.c:5789
 msgid "The calendar attached contains multiple items"
 msgstr "Liitetyssä kalenterissa on useita kohtia"
 
-#: ../src/modules/itip-formatter/itip-view.c:5769
+#: ../src/modules/itip-formatter/itip-view.c:5790
 msgid ""
 "To process all of these items, the file should be saved and the calendar imported"
 msgstr ""
 "Jos haluat käsitellä kaikki nämä kohdat, tiedosto täytyy tallentaa ja avata "
 "tuomalla tiedosto kalenteriin"
 
-#: ../src/modules/itip-formatter/itip-view.c:6307
+#: ../src/modules/itip-formatter/itip-view.c:6357
 msgctxt "cal-itip"
 msgid "None"
 msgstr "Ei mitään"
 
-#: ../src/modules/itip-formatter/itip-view.c:6323
+#: ../src/modules/itip-formatter/itip-view.c:6373
 msgid "Tentatively Accepted"
 msgstr "Alustavasti hyväksytty"
 
@@ -23914,42 +24168,42 @@ msgstr "Valitse palautettava tiedosto"
 msgid "Mbox spool directory cannot be empty"
 msgstr ""
 
-#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:198
+#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:199
 #: ../src/modules/mail-config/e-mail-config-sendmail-backend.c:59
-#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:154
+#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:155
 #: ../src/modules/plugin-manager/evolution-plugin-manager.c:193
 #: ../src/plugins/mail-notification/mail-notification.c:1220
 msgid "Configuration"
 msgstr "Asetukset"
 
-#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:230
-#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:185
+#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:231
+#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:186
 msgid "_Port:"
 msgstr "_Portti:"
 
 #. do not reference
-#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:251
-#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:313
+#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:252
+#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:314
 msgid "User_name:"
 msgstr "Käyttäjät_unnus:"
 
-#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:265
-#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:327
+#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:266
+#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:328
 msgid "_Forget password"
 msgstr "_Unohda salasana"
 
-#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:291
-#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:234
+#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:292
+#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:235
 msgid "Encryption _method:"
 msgstr "Salaus_tapa:"
 
-#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:306
-#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:249
+#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:307
+#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:250
 msgid "STARTTLS after connecting"
 msgstr "STARTTLS yhteyden muodostamisen jälkeen"
 
-#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:310
-#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:253
+#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:311
+#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:254
 #, fuzzy
 #| msgid "SSL on a dedicated port"
 msgid "TLS on a dedicated port"
@@ -23997,11 +24251,11 @@ msgid "Custom binary cannot be empty"
 msgstr "Yksi tai useampi arvo ei voi olla tyhjä."
 
 #. do not reference
-#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:206
+#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:207
 msgid "Ser_ver requires authentication"
 msgstr "P_alvelin vaati todennuksen"
 
-#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:295
+#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:296
 msgid "T_ype:"
 msgstr "_Tyyppi:"
 
@@ -24049,431 +24303,429 @@ msgstr "Luo uusi sähköpostikansio"
 
 #. Translators: One of the known implementation names of the GNetworkMonitor. Either translate
 #. it to some user-frienly form, or keep it as is.
-#: ../src/modules/mail/e-mail-shell-backend.c:734
+#: ../src/modules/mail/e-mail-shell-backend.c:751
 msgctxt "NetworkMonitor"
 msgid "base"
 msgstr ""
 
 #. Translators: One of the known implementation names of the GNetworkMonitor. Either translate
 #. it to some user-frienly form, or keep it as is.
-#: ../src/modules/mail/e-mail-shell-backend.c:737
+#: ../src/modules/mail/e-mail-shell-backend.c:754
 msgctxt "NetworkMonitor"
 msgid "netlink"
 msgstr ""
 
 #. Translators: One of the known implementation names of the GNetworkMonitor. Either translate
 #. it to some user-frienly form, or keep it as is.
-#: ../src/modules/mail/e-mail-shell-backend.c:740
+#: ../src/modules/mail/e-mail-shell-backend.c:757
 msgctxt "NetworkMonitor"
 msgid "networkmanager"
 msgstr "networkmanager"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:770
+#: ../src/modules/mail/e-mail-shell-backend.c:787
 msgctxt "NetworkMonitor"
 msgid "Method to detect _online state:"
 msgstr "Yhteydellisen tilan _havaintatapa:"
 
 #. Always as the first
-#: ../src/modules/mail/e-mail-shell-backend.c:779
+#: ../src/modules/mail/e-mail-shell-backend.c:796
 msgctxt "NetworkMonitor"
 msgid "Default"
 msgstr "Oletus"
 
 #. Always as the last
-#: ../src/modules/mail/e-mail-shell-backend.c:793
+#: ../src/modules/mail/e-mail-shell-backend.c:810
 msgctxt "NetworkMonitor"
 msgid "Always Online"
 msgstr "Aina yhteydessä"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:862
+#: ../src/modules/mail/e-mail-shell-backend.c:879
 msgid "Mail Preferences"
 msgstr "Sähköpostin asetukset"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:871
+#: ../src/modules/mail/e-mail-shell-backend.c:888
 msgid "Composer Preferences"
 msgstr "Muokkaimen asetukset"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:880
+#: ../src/modules/mail/e-mail-shell-backend.c:897
 msgid "Network Preferences"
 msgstr "Verkkoasetukset"
 
 #. Translators: The first item in the list, to be
 #. * able to set rule: [Label] [is/is-not] [None]
-#: ../src/modules/mail/e-mail-shell-backend.c:1241
+#: ../src/modules/mail/e-mail-shell-backend.c:1258
 msgctxt "label"
 msgid "None"
 msgstr "Ei mitään"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:781
+#: ../src/modules/mail/e-mail-shell-view-actions.c:821
 msgid "Marking messages as read..."
 msgstr "Merkitään viestejä luetuiksi..."
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1140
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1226
 msgid "Go to Folder"
 msgstr "Siirry kansioon"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1144
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1230
 msgid "_Select"
 msgstr "_Valitse"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1447
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1533
 msgid "_Disable Account"
 msgstr "_Poista tili käytöstä"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1449
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1535
 msgid "Disable this account"
 msgstr "Poista tämä tili käytöstä"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1456
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1542
 msgid "Permanently remove all the deleted messages from all folders"
 msgstr "Poista kaikki pyyhityt viesti pysyvästi kaikista kansioista"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1461
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1547
 #, fuzzy
 #| msgid "_Junk"
 msgid "Empty _Junk"
 msgstr "_Roskapostia"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1463
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1549
 #, fuzzy
 #| msgid "Permanently remove all the deleted messages from all folders"
 msgid "Delete all Junk messages from all folders"
 msgstr "Poista kaikki pyyhityt viesti pysyvästi kaikista kansioista"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1470
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1556
 msgid "Edit properties of this account"
 msgstr "Muokkaa tilin ominaisuuksia"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1477
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1563
 msgid "Refresh list of folders of this account"
 msgstr "Päivitä tämän tilin kansioiden luettelo"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1482
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1568
 msgid "_Download Messages for Offline Usage"
 msgstr "_Nouda viestit yhteydettömään käyttöön"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1484
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1570
 msgid "Download messages of accounts and folders marked for offline usage"
 msgstr "Lataa yhteydettömään käyttöön merkittyjen tilien ja kansioiden viestit"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1489
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1575
 msgid "Fl_ush Outbox"
 msgstr "T_yhjennä lähtevien kansio"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1496
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1582
 msgid "_Copy Folder To..."
 msgstr "_Kopioi kansio..."
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1498
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1584
 msgid "Copy the selected folder into another folder"
 msgstr "Kopioi valittu kansio toiseen kansioon"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1505
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1591
 msgid "Permanently remove this folder"
 msgstr "Poista tämä kansio pysyvästi"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1510
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1596
 msgid "E_xpunge"
 msgstr "_Poista poistetut"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1512
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1598
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "Poista pysyvästi kaikki poistetut viestit tästä kansiosta"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1517
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1609
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1603
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1695
 msgid "Mar_k All Messages as Read"
 msgstr "Mer_kitse kaikki viestit luetuiksi"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1519
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1611
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1605
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1697
 msgid "Mark all messages in the folder as read"
 msgstr "Merkitse kaikki kansion viestit luetuksi"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1524
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1610
 msgid "_Move Folder To..."
 msgstr "_Siirrä kansio..."
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1526
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1612
 msgid "Move the selected folder into another folder"
 msgstr "Siirrä valittu kansio toiseen kansioon"
 
 #. Translators: An action caption to create a new mail folder
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1532
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1618
 msgid "_New..."
 msgstr "_Uusi..."
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1534
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1620
 msgid "Create a new folder for storing mail"
 msgstr "Luo uusi kansio viestien tallentamiseen"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1541
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1627
 msgid "Change the properties of this folder"
 msgstr "Vaihda tämän kansion ominaisuuksia"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1548
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1634
 msgid "Refresh the folder"
 msgstr "Virkistä kansio"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1555
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1641
 msgid "Change the name of this folder"
 msgstr "Muuta tämän kansion nimeä"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1560
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1646
 msgid "Select Message _Thread"
 msgstr "Valitse viesti_säie"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1562
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1648
 msgid "Select all messages in the same thread as the selected message"
 msgstr "Valitse kaikki viestit, jotka ovat samassa säikeessä kuin nyt valittu viesti"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1567
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1653
 msgid "Select Message S_ubthread"
 msgstr "Valitse viesti_säie"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1569
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1655
 msgid "Select all replies to the currently selected message"
 msgstr "Valitse kaikki vastaukset nyt valittuun viestiin"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1581
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1667
 msgid "Empty _Trash"
 msgstr "_Tyhjennä roskakori"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1583
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1669
 msgid "Permanently remove all the deleted messages from all accounts"
 msgstr "Poista pysyvästi kaikki poistetut viestit kaikilta tileiltä"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1588
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1674
 msgid "Go to _Folder"
 msgstr "Siirry ka_nsioon"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1590
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1676
 #, fuzzy
 #| msgid "Click here to select folders to post to"
 msgid "Opens a dialog to select a folder to go to"
 msgstr "Valitse tästä kansiot, joihin postituksia lähetetään"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1602
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1688
 msgid "_Manage Subscriptions"
 msgstr "_Hallitse tilauksia"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1604
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1688
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1690
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1774
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Tilaa tai peru kansioiden tilauksia muilta palvelimilta"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1616
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1637
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1702
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1723
 msgid "Send / _Receive"
 msgstr "Lähetä ja _vastaanota"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1618
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1704
 msgid "Send queued items and retrieve new items"
 msgstr "Lähetä jonossa olevat viestit ja nouda uudet viestit"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1623
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1709
 msgid "R_eceive All"
 msgstr "_Vastaanota kaikki"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1625
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1711
 msgid "Receive new items from all accounts"
 msgstr "Vastaanota kohteita kaikilta tileiltä"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1630
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1716
 msgid "_Send All"
 msgstr "_Lähetä kaikki"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1632
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1718
 #, fuzzy
 msgid "Send queued items in all accounts"
 msgstr "Lähetä jonossa olevat viestit ja nouda uudet viestit"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1660
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1746
 msgid "Cancel the current mail operation"
 msgstr "Peru nykyinen postioperaatio"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1665
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1751
 msgid "Collapse All _Threads"
 msgstr "Sulje kaikki _säikeet"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1667
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1753
 msgid "Collapse all message threads"
 msgstr "Sulje kaikki viestisäikeet"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1672
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1758
 msgid "E_xpand All Threads"
 msgstr "_Laajenna kaikki säikeet"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1674
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1760
 msgid "Expand all message threads"
 msgstr "Laajenna kaikki viestisäikeet"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1679
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1765
 msgid "_Message Filters"
 msgstr "Viesti_suodattimet"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1681
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1767
 msgid "Create or edit rules for filtering new mail"
 msgstr "Luo tai muokkaa sääntöjä uuden sähköpostin suodatukseen"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1686
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1772
 msgid "_Subscriptions..."
 msgstr "_Tilaukset..."
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1695
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1781
 msgid "F_older"
 msgstr "_Kansio"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1712
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1798
 msgid "C_reate Search Folder From Search..."
 msgstr "Luo _hakunäkymä haun perusteella..."
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1719
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1805
 msgid "Search F_olders"
 msgstr "Etsi _kansioita"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1721
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1807
 msgid "Create or edit search folder definitions"
 msgstr "Luo tai muokkaa hakunäkymien määrittelyjä"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1764
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1850
 msgid "_New Folder..."
 msgstr "_Uusi kansio..."
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1792
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1878
 msgid "Show Message _Preview"
 msgstr "Näytä viestin _esikatselu"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1794
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1880
 msgid "Show message preview pane"
 msgstr "Näytä viestin esikatseluikkuna"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1800
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1886
 msgid "Show _Attachment Bar"
 msgstr "Näytä _liitepalkki"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1802
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1888
 #, fuzzy
 #| msgid "Show message preview below the message list"
 msgid ""
 "Show Attachment Bar below the message preview pane when the message has attachments"
 msgstr "Näytä viestin esikatselu viestiluettelon alla"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1808
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1894
 msgid "Show _Deleted Messages"
 msgstr "Näytä _poistetut viestit"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1810
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1896
 msgid "Show deleted messages with a line through them"
 msgstr "Näytä poistetut viestit yliviivattuna"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1816
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1902
 msgid "Show _Junk Messages"
 msgstr "Näytä _roskapostiviestit"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1818
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1904
 #, fuzzy
 #| msgid "Show deleted messages with a line through them"
 msgid "Show junk messages with a red line through them"
 msgstr "Näytä poistetut viestit yliviivattuna"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1824
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1910
 msgid "_Group By Threads"
 msgstr "Ryhmittele _säikeittäin"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1826
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1912
 msgid "Threaded message list"
 msgstr "Säikeistetty viestiluettelo"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1832
-#, fuzzy
-#| msgid "Show _Tool Bar"
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1918
 msgid "Show To _Do Bar"
-msgstr "Näytä työ_kalupalkki"
+msgstr "Näytä tehtä_väpalkki"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1834
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1920
 msgid "Show To Do bar with appointments and tasks"
 msgstr ""
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1840
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1926
 msgid "_Unmatched Folder Enabled"
 msgstr ""
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1842
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1928
 #, fuzzy
 #| msgid "Toggles whether the Role field is displayed"
 msgid "Toggles whether Unmatched search folder is enabled"
 msgstr "Määrittää näytetäänkö roolikenttä"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1862
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1948
 msgid "Show message preview below the message list"
 msgstr "Näytä viestin esikatselu viestiluettelon alla"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1869
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1955
 msgid "Show message preview alongside the message list"
 msgstr "Näytä viestin esikatselu viestiluettelon vieressä"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1877
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1963
 msgid "All Messages"
 msgstr "Kaikki viestit"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1884
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1970
 msgid "Important Messages"
 msgstr "Tärkeät viestit"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1891
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1977
 #, fuzzy
 #| msgid "Last 5 Days' Messages"
 msgid "Last 5 Days’ Messages"
 msgstr "Viimeisten viiden päivän viestit"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1898
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1984
 msgid "Messages Not Junk"
 msgstr "Viestit, jotka eivät ole roskapostia"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1905
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1991
 msgid "Messages with Attachments"
 msgstr "Viestit, joissa on liitteitä"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1912
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1998
 #, fuzzy
 #| msgid "Messages with Attachments"
 msgid "Messages with Notes"
 msgstr "Viestit, joissa on liitteitä"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1919
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2005
 msgid "No Label"
 msgstr "Ei merkintää"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1926
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2012
 msgid "Read Messages"
 msgstr "Luetut viestit"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1933
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2019
 msgid "Unread Messages"
 msgstr "Lukemattomat viestit"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1940
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2026
 msgid "Message Thread"
 msgstr "Viestinketju"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2000
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2086
 msgid "Subject or Addresses contain"
 msgstr "Aihe tai osoitteet sisältävät"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2010
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2096
 msgid "All Accounts"
 msgstr "Kaikki tilit"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2017
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2103
 msgid "Current Account"
 msgstr "Valittu tili"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2024
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2110
 msgid "Current Folder"
 msgstr "Valittu kansio"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2031
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2117
 #, fuzzy
 #| msgid "In Current Folder and _Subfolders"
 msgid "Current Folder and Subfolders"
@@ -24493,90 +24745,96 @@ msgstr "Etsi kaikilta tileiltä"
 msgid "Account Search"
 msgstr "Haku tileiltä"
 
-#: ../src/modules/mail/e-mail-shell-view-private.c:897
+#: ../src/modules/mail/e-mail-shell-view-private.c:926
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "%d valittu, "
 msgstr[1] "%d valittua, "
 
-#: ../src/modules/mail/e-mail-shell-view-private.c:912
-#: ../src/modules/mail/e-mail-shell-view-private.c:929
+#: ../src/modules/mail/e-mail-shell-view-private.c:941
+#: ../src/modules/mail/e-mail-shell-view-private.c:958
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d poistettu"
 msgstr[1] "%d poistettua"
 
-#: ../src/modules/mail/e-mail-shell-view-private.c:943
-#: ../src/modules/mail/e-mail-shell-view-private.c:949
+#: ../src/modules/mail/e-mail-shell-view-private.c:972
+#: ../src/modules/mail/e-mail-shell-view-private.c:978
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d roskaposti"
 msgstr[1] "%d roskapostia"
 
-#: ../src/modules/mail/e-mail-shell-view-private.c:956
+#: ../src/modules/mail/e-mail-shell-view-private.c:985
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d luonnos"
 msgstr[1] "%d luonnosta"
 
-#: ../src/modules/mail/e-mail-shell-view-private.c:962
+#: ../src/modules/mail/e-mail-shell-view-private.c:991
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d lähettämätön"
 msgstr[1] "%d lähettämätöntä"
 
-#: ../src/modules/mail/e-mail-shell-view-private.c:968
+#: ../src/modules/mail/e-mail-shell-view-private.c:997
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d lähetetty"
 msgstr[1] "%d lähetettyä"
 
-#: ../src/modules/mail/e-mail-shell-view-private.c:985
+#: ../src/modules/mail/e-mail-shell-view-private.c:1014
 #, c-format
 msgid "%d unread"
 msgid_plural "%d unread"
 msgstr[0] "%d lukematon"
 msgstr[1] "%d lukematonta"
 
-#: ../src/modules/mail/e-mail-shell-view-private.c:1503
+#: ../src/modules/mail/e-mail-shell-view-private.c:1532
 msgid "Send / Receive"
 msgstr "Lähetä / Vastaanota"
 
-#: ../src/modules/mail/em-composer-prefs.c:419
+#: ../src/modules/mail/em-composer-prefs.c:420
 msgid "Select Folder to Add"
 msgstr "Valitse lisättävä kansio"
 
-#: ../src/modules/mail/em-composer-prefs.c:895
+#: ../src/modules/mail/em-composer-prefs.c:896
 msgid "Folder"
 msgstr "Kansio"
 
-#: ../src/modules/mail/em-composer-prefs.c:931
+#: ../src/modules/mail/em-composer-prefs.c:932
 msgid "Recipient"
 msgstr "Vastaanottaja"
 
-#: ../src/modules/mail/em-composer-prefs.c:1222
+#: ../src/modules/mail/em-composer-prefs.c:1223
 #, fuzzy
 msgid "Keep in Outbox"
 msgstr "_Tallenna mbox-muodossa..."
 
-#: ../src/modules/mail/em-composer-prefs.c:1223
+#: ../src/modules/mail/em-composer-prefs.c:1224
 msgid "Send immediately"
 msgstr "Lähetä välittömästi"
 
-#: ../src/modules/mail/em-composer-prefs.c:1224
+#: ../src/modules/mail/em-composer-prefs.c:1225
 msgid "Send after 5 minutes"
 msgstr "Lähetä 5 minuutin jälkeen"
 
-#: ../src/modules/mail/em-composer-prefs.c:1309
+#: ../src/modules/mail/em-composer-prefs.c:1310
 msgid "Language(s)"
 msgstr "Kielet"
 
+#: ../src/modules/mail/em-composer-prefs.c:1340
+#, fuzzy
+#| msgid "Saving user interface state"
+msgid "Same as user interface"
+msgstr "Tallennetaan käyttöliittymän tilaa"
+
 #: ../src/modules/mail/em-mailer-prefs.c:77
 msgid "On exit, every time"
 msgstr "Poistuessa, joka kerta"
@@ -24854,7 +25112,7 @@ msgstr "Tuonti peruttiin."
 msgid "Import complete."
 msgstr "Tuonti valmistui."
 
-#: ../src/modules/startup-wizard/e-startup-assistant.c:158
+#: ../src/modules/startup-wizard/e-startup-assistant.c:186
 msgid ""
 "Welcome to Evolution.\n"
 "\n"
@@ -24866,10 +25124,23 @@ msgstr ""
 "Seuraavaksi kysyttävien tietojen avulla Evolution ottaa yhteyttä "
 "sähköpostitileihisi ja tuo tarvittavia tietoja muista sovelluksista."
 
-#: ../src/modules/startup-wizard/e-startup-assistant.c:165
+#: ../src/modules/startup-wizard/e-startup-assistant.c:193
 msgid "Do not _show this wizard again"
 msgstr "Älä näytä tätä avustajaa uu_destaan"
 
+#. Translators: This is part of "Alternatively, you can %s (email, contacts and calendaring) instead." 
sentence from the same translation context.
+#: ../src/modules/startup-wizard/e-startup-assistant.c:206
+msgctxt "wizard-ca-note"
+msgid "create a collection account"
+msgstr "luoda uuden kokoelmatilin"
+
+#. Translators: The '%s' is replaced with "create a collection account" from the same translation context.
+#: ../src/modules/startup-wizard/e-startup-assistant.c:208
+#, c-format
+msgctxt "wizard-ca-note"
+msgid "Alternatively, you can %s (email, contacts and calendaring) instead."
+msgstr "Vaihtoehtoisesti voit sen sijaan %s (sähköposti, yhteystiedot ja kalenteri)."
+
 #: ../src/modules/startup-wizard/evolution-startup-wizard.c:212
 msgid "Loading accounts..."
 msgstr "Ladataan tilejä..."
@@ -25136,8 +25407,8 @@ msgstr ""
 msgid "_Do not show this message again."
 msgstr "Älä _näytä tätä viestiä uudestaan."
 
-#: ../src/plugins/attachment-reminder/attachment-reminder.c:570
-#: ../src/plugins/templates/templates.c:487
+#: ../src/plugins/attachment-reminder/attachment-reminder.c:571
+#: ../src/plugins/templates/templates.c:489
 msgid "Keywords"
 msgstr "Avainsanat"
 
@@ -25238,54 +25509,54 @@ msgstr "Outlook Express 5/6 -henkilökohtaiset kansiot (.dbx)"
 msgid "Import Outlook Express messages from DBX file"
 msgstr "Tuodaan Outlook Express -viestejä DBX-tiedostosta"
 
-#: ../src/plugins/email-custom-header/email-custom-header.c:291
+#: ../src/plugins/email-custom-header/email-custom-header.c:292
 msgctxt "email-custom-header-Security"
 msgid "Security:"
 msgstr "Turvallisuus:"
 
-#: ../src/plugins/email-custom-header/email-custom-header.c:295
+#: ../src/plugins/email-custom-header/email-custom-header.c:296
 msgctxt "email-custom-header-Security"
 msgid "Personal"
 msgstr "Henkilökohtainen"
 
-#: ../src/plugins/email-custom-header/email-custom-header.c:296
+#: ../src/plugins/email-custom-header/email-custom-header.c:297
 msgctxt "email-custom-header-Security"
 msgid "Unclassified"
 msgstr "Luokittelematon"
 
-#: ../src/plugins/email-custom-header/email-custom-header.c:297
+#: ../src/plugins/email-custom-header/email-custom-header.c:298
 msgctxt "email-custom-header-Security"
 msgid "Protected"
 msgstr "Suojattu"
 
-#: ../src/plugins/email-custom-header/email-custom-header.c:298
+#: ../src/plugins/email-custom-header/email-custom-header.c:299
 msgctxt "email-custom-header-Security"
 msgid "Confidential"
 msgstr "Luottamuksellinen"
 
-#: ../src/plugins/email-custom-header/email-custom-header.c:299
+#: ../src/plugins/email-custom-header/email-custom-header.c:300
 msgctxt "email-custom-header-Security"
 msgid "Secret"
 msgstr "Salainen"
 
-#: ../src/plugins/email-custom-header/email-custom-header.c:300
+#: ../src/plugins/email-custom-header/email-custom-header.c:301
 msgctxt "email-custom-header-Security"
 msgid "Top secret"
 msgstr "Erittäin salainen"
 
 #. Translators: "None" as an email custom header option in a dialog invoked by Insert->Custom Header from 
Composer,
 #. * indicating the header will not be added to a mail message
-#: ../src/plugins/email-custom-header/email-custom-header.c:360
+#: ../src/plugins/email-custom-header/email-custom-header.c:361
 msgctxt "email-custom-header"
 msgid "None"
 msgstr "Ei mitään"
 
-#: ../src/plugins/email-custom-header/email-custom-header.c:537
+#: ../src/plugins/email-custom-header/email-custom-header.c:538
 msgid "_Custom Header"
 msgstr "_Omat otsakkeet"
 
 #. To translators: This string is used while adding a new message header to configuration, to specifying the 
format of the key values
-#: ../src/plugins/email-custom-header/email-custom-header.c:807
+#: ../src/plugins/email-custom-header/email-custom-header.c:808
 #, fuzzy
 #| msgid ""
 #| "The format for specifying a Custom Header key value is:\n"
@@ -25297,12 +25568,12 @@ msgstr ""
 "Omien otsakeavainten määrittelyssä käytetty muoto on seuraava:\n"
 "Omien otsakenimien avainarvot eroteltuna merkillä \";\"."
 
-#: ../src/plugins/email-custom-header/email-custom-header.c:860
+#: ../src/plugins/email-custom-header/email-custom-header.c:861
 msgid "Key"
 msgstr "Avaimet"
 
-#: ../src/plugins/email-custom-header/email-custom-header.c:877
-#: ../src/plugins/templates/templates.c:496
+#: ../src/plugins/email-custom-header/email-custom-header.c:878
+#: ../src/plugins/templates/templates.c:498
 msgid "Values"
 msgstr "Arvot"
 
@@ -25383,27 +25654,27 @@ msgstr ""
 "Ulkoinen muokkain on vielä käynnissä. Viestin lähetysikkunaa ei voi sulkea ennen "
 "kuin ulkoinen muokkain on käynnissä."
 
-#: ../src/plugins/face/face.c:292
+#: ../src/plugins/face/face.c:295
 msgid "Select a Face Picture"
 msgstr "Valitse kasvokuva"
 
-#: ../src/plugins/face/face.c:302
+#: ../src/plugins/face/face.c:301
 msgid "Image files"
 msgstr "Kuvatiedostot"
 
-#: ../src/plugins/face/face.c:390
+#: ../src/plugins/face/face.c:389
 msgid "_Insert Face picture by default"
 msgstr "_Lisää kasvokuva oletuksena"
 
-#: ../src/plugins/face/face.c:403
+#: ../src/plugins/face/face.c:402
 msgid "Load new _Face picture"
 msgstr "Lataa uusi _kasvokuva"
 
-#: ../src/plugins/face/face.c:447
+#: ../src/plugins/face/face.c:446
 msgid "Change Face Image"
 msgstr "Muuta kasvokuvaa"
 
-#: ../src/plugins/face/face.c:535
+#: ../src/plugins/face/face.c:534
 msgid "Include _Face"
 msgstr "Sisällytä _kasvokuva"
 
@@ -25424,14 +25695,11 @@ msgid "Invalid Image Size"
 msgstr "Virheellinen kuvakoko"
 
 #: ../src/plugins/face/org-gnome-face.error.xml.h:4
-#, fuzzy
-#| msgid ""
-#| "Please select a PNG image of size 48 * 48 pixels, whose file size doesn't "
-#| "exceed 723 bytes."
 msgid ""
 "Please select a PNG image of size 48 × 48 pixels, whose file size doesn’t exceed "
 "723 bytes."
-msgstr "Valitse PNG-kuva kokoa 48 * 48 pikseliä, jonka koko ei ylitä 723 tavua."
+msgstr ""
+"Valitse PNG-kuva kokoa 48 × 48 pikseliä, jonka tiedostokoko ei ylitä 723 tavua."
 
 #: ../src/plugins/face/org-gnome-face.error.xml.h:5
 msgid "Incorrect Face Image Byte Size"
@@ -26150,7 +26418,7 @@ msgstr "_Kapsuloi arvot käyttäen:"
 msgid "Comma separated values (.csv)"
 msgstr "Pilkuin erotetut arvot (.csv)"
 
-#: ../src/plugins/save-calendar/ical-format.c:181 ../src/shell/e-shell-utils.c:182
+#: ../src/plugins/save-calendar/ical-format.c:181 ../src/shell/e-shell-utils.c:172
 msgid "iCalendar (.ics)"
 msgstr "iCalendar (.ics)"
 
@@ -26175,11 +26443,11 @@ msgstr "%FT%T"
 msgid "RDF (.rdf)"
 msgstr "RDF-tiedostot (.rdf)"
 
-#: ../src/plugins/save-calendar/save-calendar.c:117
+#: ../src/plugins/save-calendar/save-calendar.c:116
 msgid "_Format:"
 msgstr "_Muoto:"
 
-#: ../src/plugins/save-calendar/save-calendar.c:182
+#: ../src/plugins/save-calendar/save-calendar.c:183
 msgid "Select destination file"
 msgstr "Valitse kohdetiedosto"
 
@@ -26187,35 +26455,35 @@ msgstr "Valitse kohdetiedosto"
 msgid "_Save As"
 msgstr "_Tallenna nimellä"
 
-#: ../src/plugins/save-calendar/save-calendar.c:349
+#: ../src/plugins/save-calendar/save-calendar.c:346
 msgid "Save the selected calendar to disk"
 msgstr "Tallenna valittu kalenteri levylle"
 
-#: ../src/plugins/save-calendar/save-calendar.c:388
+#: ../src/plugins/save-calendar/save-calendar.c:385
 msgid "Save the selected memo list to disk"
 msgstr "Tallenna valittu muistilappu levylle"
 
-#: ../src/plugins/save-calendar/save-calendar.c:427
+#: ../src/plugins/save-calendar/save-calendar.c:424
 msgid "Save the selected task list to disk"
 msgstr "Tallenna valittu tehtävälista levylle"
 
 #: ../src/plugins/templates/org-gnome-templates.eplug.xml.h:2
 msgid ""
 "Drafts based template plugin. You can use variables like $ORIG[subject], "
-"$ORIG[from], $ORIG[to] or $ORIG[body], which will be replaced by values from an "
-"email you are replying to."
+"$ORIG[from], $ORIG[to], $ORIG[body], $ORIG[quoted-body] or $ORIG[reply-credits], "
+"which will be replaced by values from an email you are replying to."
 msgstr ""
 
-#: ../src/plugins/templates/templates.c:874
+#: ../src/plugins/templates/templates.c:878
 #, fuzzy
 msgid "Saving message template"
 msgstr "Tallennetaan viestiä kansioon"
 
-#: ../src/plugins/templates/templates.c:895
+#: ../src/plugins/templates/templates.c:899
 msgid "Save as _Template"
 msgstr "Tallenna _pohjana"
 
-#: ../src/plugins/templates/templates.c:897
+#: ../src/plugins/templates/templates.c:901
 msgid "Save as Template"
 msgstr "Tallenna pohjana"
 
@@ -26243,15 +26511,15 @@ msgstr "_Avaa asetukset"
 msgid "Credentials are required to connect to the destination host."
 msgstr "Tilitiedot vaaditaan etäpalvelimeen yhdistämiseksi."
 
-#: ../src/shell/e-shell.c:1448 ../src/shell/e-shell-window-actions.c:850
+#: ../src/shell/e-shell.c:1448 ../src/shell/e-shell-window-actions.c:873
 msgid "New _Window"
 msgstr "Uusi _Ikkuna"
 
-#: ../src/shell/e-shell.c:1459 ../src/shell/e-shell-window-actions.c:780
+#: ../src/shell/e-shell.c:1459 ../src/shell/e-shell-window-actions.c:803
 msgid "_About"
 msgstr "_Tietoja"
 
-#: ../src/shell/e-shell.c:1460 ../src/shell/e-shell-window-actions.c:878
+#: ../src/shell/e-shell.c:1460 ../src/shell/e-shell-window-actions.c:901
 msgid "_Quit"
 msgstr "_Lopeta"
 
@@ -26283,21 +26551,21 @@ msgstr "_Etsi:"
 msgid "i_n"
 msgstr "lä_hteestä"
 
-#: ../src/shell/e-shell-utils.c:179
+#: ../src/shell/e-shell-utils.c:169
 msgid "vCard (.vcf)"
 msgstr "vCard (.vcf)"
 
-#: ../src/shell/e-shell-utils.c:205
+#: ../src/shell/e-shell-utils.c:195
 msgid "All Files (*)"
 msgstr "Kaikki tiedostot (*)"
 
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../src/shell/e-shell-utils.c:353
+#: ../src/shell/e-shell-utils.c:343
 msgid "translator-credits"
 msgstr ""
-"Jiri Grönroos, 2012-2018\n"
+"Jiri Grönroos, 2012-2019\n"
 "Ilkka Tuohela, 2002-2009\n"
 "Timo Jyrinki, 2008\n"
 "Sami Pesonen, 2001-2003\n"
@@ -26322,7 +26590,7 @@ msgstr ""
 "  Timo Jyrinki https://launchpad.net/~timo-jyrinki\n";
 "  papukaija https://launchpad.net/~papukaija";
 
-#: ../src/shell/e-shell-utils.c:364
+#: ../src/shell/e-shell-utils.c:354
 msgid "Evolution Website"
 msgstr "Evolutionin www-sivut"
 
@@ -26342,260 +26610,268 @@ msgstr "Bug buddya ei ole asennettu."
 msgid "Bug Buddy could not be run."
 msgstr "Bug buddya ei voitu suorittaa."
 
-#: ../src/shell/e-shell-window-actions.c:782
+#: ../src/shell/e-shell-window-actions.c:793
+msgid "Collect_ion Account"
+msgstr "_Kokoelmatili"
+
+#: ../src/shell/e-shell-window-actions.c:795
+msgid "Create a new collection account"
+msgstr "Luo uusi kokoelmatili"
+
+#: ../src/shell/e-shell-window-actions.c:805
 msgid "Show information about Evolution"
 msgstr "Näytä tietoja Evolutionista"
 
-#: ../src/shell/e-shell-window-actions.c:787
+#: ../src/shell/e-shell-window-actions.c:810
 msgid "_Accounts"
 msgstr "_Tilit"
 
-#: ../src/shell/e-shell-window-actions.c:789
+#: ../src/shell/e-shell-window-actions.c:812
 msgid "Configure Evolution Accounts"
 msgstr "Määritä Evolution-tilit"
 
-#: ../src/shell/e-shell-window-actions.c:794
-#: ../src/shell/e-shell-window-actions.c:808
+#: ../src/shell/e-shell-window-actions.c:817
+#: ../src/shell/e-shell-window-actions.c:831
 msgid "_Close Window"
 msgstr "_Sulje ikkuna"
 
-#: ../src/shell/e-shell-window-actions.c:815
+#: ../src/shell/e-shell-window-actions.c:838
 msgid "_Contents"
 msgstr "_Sisältö"
 
-#: ../src/shell/e-shell-window-actions.c:817
+#: ../src/shell/e-shell-window-actions.c:840
 msgid "Open the Evolution User Guide"
 msgstr "Avaa Evolutionin käyttäjäopas"
 
-#: ../src/shell/e-shell-window-actions.c:843
+#: ../src/shell/e-shell-window-actions.c:866
 msgid "I_mport..."
 msgstr "_Tuo..."
 
-#: ../src/shell/e-shell-window-actions.c:845
+#: ../src/shell/e-shell-window-actions.c:868
 msgid "Import data from other programs"
 msgstr "Tuo tietoja muista ohjelmista"
 
-#: ../src/shell/e-shell-window-actions.c:852
+#: ../src/shell/e-shell-window-actions.c:875
 msgid "Create a new window displaying this view"
 msgstr "Luo uusi ikkuna tälle näkymälle"
 
-#: ../src/shell/e-shell-window-actions.c:864
+#: ../src/shell/e-shell-window-actions.c:887
 msgid "Available Cate_gories"
 msgstr "Käytettävissä olevat _luokat"
 
-#: ../src/shell/e-shell-window-actions.c:866
+#: ../src/shell/e-shell-window-actions.c:889
 msgid "Manage available categories"
 msgstr "Hallitse käytettävissä olevia luokkia"
 
-#: ../src/shell/e-shell-window-actions.c:880
+#: ../src/shell/e-shell-window-actions.c:903
 msgid "Exit the program"
 msgstr "Poistu ohjelmasta"
 
-#: ../src/shell/e-shell-window-actions.c:885
+#: ../src/shell/e-shell-window-actions.c:908
 msgid "_Advanced Search..."
 msgstr "_Oma haku..."
 
-#: ../src/shell/e-shell-window-actions.c:887
+#: ../src/shell/e-shell-window-actions.c:910
 msgid "Construct a more advanced search"
 msgstr "Luo monimutkaisempi haku"
 
-#: ../src/shell/e-shell-window-actions.c:894
+#: ../src/shell/e-shell-window-actions.c:917
 msgid "Clear the current search parameters"
 msgstr "Tyhjennä nykyiset hakuehdot"
 
-#: ../src/shell/e-shell-window-actions.c:899
+#: ../src/shell/e-shell-window-actions.c:922
 msgid "_Edit Saved Searches..."
 msgstr "_Muokkaa tallennettuja hakuja..."
 
-#: ../src/shell/e-shell-window-actions.c:901
+#: ../src/shell/e-shell-window-actions.c:924
 msgid "Manage your saved searches"
 msgstr "Hallitse tallennettuja hakuja"
 
-#: ../src/shell/e-shell-window-actions.c:908
+#: ../src/shell/e-shell-window-actions.c:931
 msgid "Click here to change the search type"
 msgstr "Muuta hakutyyppiä napsauttamalla tästä"
 
-#: ../src/shell/e-shell-window-actions.c:913
+#: ../src/shell/e-shell-window-actions.c:936
 msgid "_Find Now"
 msgstr "_Etsi nyt"
 
-#: ../src/shell/e-shell-window-actions.c:915
+#: ../src/shell/e-shell-window-actions.c:938
 msgid "Execute the current search parameters"
 msgstr "Suorita tämänhetkiset hakuehdot"
 
-#: ../src/shell/e-shell-window-actions.c:920
+#: ../src/shell/e-shell-window-actions.c:943
 msgid "_Save Search..."
 msgstr "_Tallenna haku..."
 
-#: ../src/shell/e-shell-window-actions.c:922
+#: ../src/shell/e-shell-window-actions.c:945
 msgid "Save the current search parameters"
 msgstr "Tallenna tämänhetkiset hakuehdot"
 
-#: ../src/shell/e-shell-window-actions.c:934
+#: ../src/shell/e-shell-window-actions.c:957
 msgid "Submit _Bug Report..."
 msgstr "Lähetä _vikailmoitus..."
 
-#: ../src/shell/e-shell-window-actions.c:936
+#: ../src/shell/e-shell-window-actions.c:959
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Lähetä vikailmoitus käyttäen Bug Buddyä"
 
-#: ../src/shell/e-shell-window-actions.c:941
+#: ../src/shell/e-shell-window-actions.c:964
 msgid "_Work Offline"
 msgstr "_Katkaise verkkoyhteydet"
 
-#: ../src/shell/e-shell-window-actions.c:943
+#: ../src/shell/e-shell-window-actions.c:966
 msgid "Put Evolution into offline mode"
 msgstr "Katkaise verkkoyhteydet"
 
-#: ../src/shell/e-shell-window-actions.c:948
+#: ../src/shell/e-shell-window-actions.c:971
 msgid "_Work Online"
 msgstr "A_vaa verkkoyhteydet"
 
-#: ../src/shell/e-shell-window-actions.c:950
+#: ../src/shell/e-shell-window-actions.c:973
 msgid "Put Evolution into online mode"
 msgstr "Avaa verkkoyhteydet"
 
-#: ../src/shell/e-shell-window-actions.c:978
+#: ../src/shell/e-shell-window-actions.c:1001
 msgid "Lay_out"
 msgstr "_Asettelu"
 
 #. Translators: This is a New menu item caption, under File->New
-#: ../src/shell/e-shell-window-actions.c:986
+#: ../src/shell/e-shell-window-actions.c:1009
 msgid "_New"
 msgstr "_Uusi"
 
-#: ../src/shell/e-shell-window-actions.c:993
+#: ../src/shell/e-shell-window-actions.c:1016
 msgid "_Search"
 msgstr "Et_si"
 
-#: ../src/shell/e-shell-window-actions.c:1000
+#: ../src/shell/e-shell-window-actions.c:1023
 msgid "_Switcher Appearance"
 msgstr "Valit_simen tyyli"
 
-#: ../src/shell/e-shell-window-actions.c:1014
+#: ../src/shell/e-shell-window-actions.c:1037
 msgid "_Window"
 msgstr "_Ikkuna"
 
-#: ../src/shell/e-shell-window-actions.c:1043
+#: ../src/shell/e-shell-window-actions.c:1066
 msgid "Show _Menu Bar"
 msgstr "Näytä _valikkopalkki"
 
-#: ../src/shell/e-shell-window-actions.c:1045
+#: ../src/shell/e-shell-window-actions.c:1068
 msgid "Show the menu bar"
 msgstr "Näytä valikkopalkki"
 
-#: ../src/shell/e-shell-window-actions.c:1051
+#: ../src/shell/e-shell-window-actions.c:1074
 msgid "Show Side _Bar"
 msgstr "Näytä sivu_palkki"
 
-#: ../src/shell/e-shell-window-actions.c:1053
+#: ../src/shell/e-shell-window-actions.c:1076
 msgid "Show the side bar"
 msgstr "Näytä sivupalkki"
 
-#: ../src/shell/e-shell-window-actions.c:1059
+#: ../src/shell/e-shell-window-actions.c:1082
 msgid "Show _Buttons"
 msgstr "Näytä _painikkeet"
 
-#: ../src/shell/e-shell-window-actions.c:1061
+#: ../src/shell/e-shell-window-actions.c:1084
 msgid "Show the switcher buttons"
 msgstr "Näytä vaihtimen painikkeet"
 
-#: ../src/shell/e-shell-window-actions.c:1067
+#: ../src/shell/e-shell-window-actions.c:1090
 msgid "Show _Status Bar"
 msgstr "Näytä _tilarivi"
 
-#: ../src/shell/e-shell-window-actions.c:1069
+#: ../src/shell/e-shell-window-actions.c:1092
 msgid "Show the status bar"
 msgstr "Näytä tilarivi"
 
-#: ../src/shell/e-shell-window-actions.c:1075
+#: ../src/shell/e-shell-window-actions.c:1098
 msgid "Show _Tool Bar"
 msgstr "Näytä työ_kalupalkki"
 
-#: ../src/shell/e-shell-window-actions.c:1077
+#: ../src/shell/e-shell-window-actions.c:1100
 msgid "Show the tool bar"
 msgstr "Näytä työkalurivi"
 
-#: ../src/shell/e-shell-window-actions.c:1099
+#: ../src/shell/e-shell-window-actions.c:1122
 msgid "_Icons Only"
 msgstr "Vain _kuvakkeet"
 
-#: ../src/shell/e-shell-window-actions.c:1101
+#: ../src/shell/e-shell-window-actions.c:1124
 msgid "Display window buttons with icons only"
 msgstr "Näytä ikkunan napit ainoastaan kuvakkeina"
 
-#: ../src/shell/e-shell-window-actions.c:1106
+#: ../src/shell/e-shell-window-actions.c:1129
 msgid "_Text Only"
 msgstr "Vain _teksti"
 
-#: ../src/shell/e-shell-window-actions.c:1108
+#: ../src/shell/e-shell-window-actions.c:1131
 msgid "Display window buttons with text only"
 msgstr "Näytä ikkunan napit ainoastaan tekstinä"
 
-#: ../src/shell/e-shell-window-actions.c:1113
+#: ../src/shell/e-shell-window-actions.c:1136
 msgid "Icons _and Text"
 msgstr "Kuvakkeet _ja teksti"
 
-#: ../src/shell/e-shell-window-actions.c:1115
+#: ../src/shell/e-shell-window-actions.c:1138
 msgid "Display window buttons with icons and text"
 msgstr "Näytä ikkunan napit kuvakkeina ja tekstinä"
 
-#: ../src/shell/e-shell-window-actions.c:1120
+#: ../src/shell/e-shell-window-actions.c:1143
 msgid "Tool_bar Style"
 msgstr "_Työkalupalkin tyyli"
 
-#: ../src/shell/e-shell-window-actions.c:1122
+#: ../src/shell/e-shell-window-actions.c:1145
 msgid "Display window buttons using the desktop toolbar setting"
 msgstr "Näytä ikkunan napit työpöydän työkalupalkin asetuksen mukaisesti"
 
-#: ../src/shell/e-shell-window-actions.c:1130
+#: ../src/shell/e-shell-window-actions.c:1153
 msgid "Delete Current View"
 msgstr "Poista nykyinen näkymä"
 
-#: ../src/shell/e-shell-window-actions.c:1137
+#: ../src/shell/e-shell-window-actions.c:1160
 msgid "Save Custom View..."
 msgstr "Tallenna oma näkymä..."
 
-#: ../src/shell/e-shell-window-actions.c:1139
+#: ../src/shell/e-shell-window-actions.c:1162
 msgid "Save current custom view"
 msgstr "Tallenna nykyinen muokattu näkymä"
 
-#: ../src/shell/e-shell-window-actions.c:1146
+#: ../src/shell/e-shell-window-actions.c:1169
 msgid "C_urrent View"
 msgstr "N_ykyinen näkymä"
 
-#: ../src/shell/e-shell-window-actions.c:1156
+#: ../src/shell/e-shell-window-actions.c:1179
 msgid "Custom View"
 msgstr "Oma näkymä"
 
-#: ../src/shell/e-shell-window-actions.c:1158
+#: ../src/shell/e-shell-window-actions.c:1181
 msgid "Current view is a customized view"
 msgstr "Nykyinen näkymä tai muokattu näkymä"
 
-#: ../src/shell/e-shell-window-actions.c:1166
+#: ../src/shell/e-shell-window-actions.c:1189
 msgid "Page Set_up..."
 msgstr "_Sivun asetukset..."
 
-#: ../src/shell/e-shell-window-actions.c:1168
+#: ../src/shell/e-shell-window-actions.c:1191
 msgid "Change the page settings for your current printer"
 msgstr "Muuta nykyisen tulostimen sivuasetuksia"
 
-#: ../src/shell/e-shell-window-actions.c:1535
+#: ../src/shell/e-shell-window-actions.c:1561
 #, c-format
 msgid "Switch to %s"
 msgstr "Avaa %s"
 
-#: ../src/shell/e-shell-window-actions.c:1658
+#: ../src/shell/e-shell-window-actions.c:1684
 #, c-format
 msgid "Select view: %s"
 msgstr "Valitse näkymä: %s"
 
-#: ../src/shell/e-shell-window-actions.c:1675
+#: ../src/shell/e-shell-window-actions.c:1701
 #, c-format
 msgid "Delete view: %s"
 msgstr "Poista näkymä: %s"
 
-#: ../src/shell/e-shell-window-actions.c:1779
+#: ../src/shell/e-shell-window-actions.c:1805
 msgid "Execute these search parameters"
 msgstr "Suorita nämä hakuehdot"
 
@@ -26607,7 +26883,7 @@ msgid "New"
 msgstr "Uusi"
 
 #. Translators: This is used for the main window title.
-#: ../src/shell/e-shell-window-private.c:756
+#: ../src/shell/e-shell-window-private.c:787
 #, c-format
 msgid "%s — Evolution"
 msgstr "%s — Evolution"
@@ -26625,7 +26901,8 @@ msgid ""
 "If you want a stable version of Evolution, we urge you to uninstall\n"
 "this version, and install version %s instead.\n"
 "\n"
-"If you find bugs, please report them to us at bugzilla.gnome.org.\n"
+"If you find bugs, please report them at\n"
+"https://gitlab.gnome.org/GNOME/evolution/issues/.\n";
 "This product comes with no warranty and is not intended for\n"
 "individuals prone to violent fits of anger.\n"
 "\n"
@@ -26643,13 +26920,14 @@ msgstr ""
 "tämän version ja asennat tilalle version %s.\n"
 "\n"
 "Jos löydät tästä versiosta vikoja, ole hyvä ja raportoi ne osoitteessa\n"
-"bugzilla.gnome.org. Tällä tuotteella ei ole minkäänlaisia takuita eikä\n"
+"https://gitlab.gnome.org/GNOME/evolution/issues/. Tällä tuotteella ei ole "
+"minkäänlaisia takuita eikä\n"
 "sitä ole tarkoitettu henkilöille, jotka ovat taipuvaisia väkivaltaan.\n"
 "\n"
 "Toivomme että nautit kovan työmme tuloksista, ja odotamme innolla\n"
 "osallistumistasi kehitystyöhön!\n"
 
-#: ../src/shell/main.c:216
+#: ../src/shell/main.c:217
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -26657,13 +26935,13 @@ msgstr ""
 "Kiitos\n"
 "Evolution-tiimi\n"
 
-#: ../src/shell/main.c:222
+#: ../src/shell/main.c:223
 msgid "Do not tell me again"
 msgstr "Älä kerro tätä uudestaan"
 
 #. Translators: Do NOT translate the five component
 #. * names, they MUST remain in English!
-#: ../src/shell/main.c:311
+#: ../src/shell/main.c:312
 #, fuzzy
 #| msgid ""
 #| "Start Evolution showing the specified component. Available options are 'mail', "
@@ -26675,40 +26953,40 @@ msgstr ""
 "Käynnistä Evolution näyttäen tiettyä näkymää. Käytettävissä olevat valinnat ovat "
 "'mail', 'calendar', 'contacts', 'tasks' ja 'memos'"
 
-#: ../src/shell/main.c:315
+#: ../src/shell/main.c:316
 msgid "Apply the given geometry to the main window"
 msgstr "Käytä annettua muotoa pääikkunalle"
 
-#: ../src/shell/main.c:319
+#: ../src/shell/main.c:320
 msgid "Start in online mode"
 msgstr "Käynnistä verkkoyhteydet auki"
 
-#: ../src/shell/main.c:321
+#: ../src/shell/main.c:322
 msgid "Ignore network availability"
 msgstr "Älä kiinnitä huomiota, onko verkko käytettävissä vai ei"
 
-#: ../src/shell/main.c:324
+#: ../src/shell/main.c:325
 msgid "Forcibly shut down Evolution"
 msgstr "Sammuta Evolution väkisin"
 
-#: ../src/shell/main.c:327
+#: ../src/shell/main.c:328
 msgid "Disable loading of any plugins."
 msgstr "Älä lataa mitään lisäosia."
 
-#: ../src/shell/main.c:329
+#: ../src/shell/main.c:330
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "Poista sähköpostien, yhteystietojen ja tehtävien esikatselu käytöstä."
 
-#: ../src/shell/main.c:333
+#: ../src/shell/main.c:334
 #, fuzzy
 msgid "Import URIs or filenames given as rest of arguments."
 msgstr "Tuo argumentteina annettavat URI-osoitteet tai tiedostot."
 
-#: ../src/shell/main.c:335
+#: ../src/shell/main.c:336
 msgid "Request a running Evolution process to quit"
 msgstr "Pyydä käynnissä olevaa Evolution-prosessia lopettamaan"
 
-#: ../src/shell/main.c:417
+#: ../src/shell/main.c:418
 #, c-format
 msgid ""
 "Cannot start Evolution.  Another Evolution instance may be unresponsive. System "
@@ -26717,11 +26995,11 @@ msgstr ""
 "Evolutionin käynnistäminen epäonnistui. Toinen Evolution-istunto saattaa olla "
 "reagoimaton. Järjestelmävirhe: %s"
 
-#: ../src/shell/main.c:473 ../src/shell/main.c:478
+#: ../src/shell/main.c:474 ../src/shell/main.c:479
 msgid "— The Evolution PIM and Email Client"
 msgstr "— Evolution, henkilökohtaisten tietojen hallinta sekä sähköposti"
 
-#: ../src/shell/main.c:540
+#: ../src/shell/main.c:541
 #, fuzzy, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -26730,7 +27008,7 @@ msgstr ""
 "%s: --online ja --offline eivät voi olla käytössä samaan aikaan.\n"
 " Käytä %s '--help' saadaksesi lisätietoja.\n"
 
-#: ../src/shell/main.c:546
+#: ../src/shell/main.c:547
 #, fuzzy, c-format
 msgid ""
 "%s: --force-online and --offline cannot be used together.\n"
@@ -26855,7 +27133,7 @@ msgstr ""
 
 #: ../src/shell/shell.error.xml.h:26
 msgid "SSL certificate for “{0}” is not trusted."
-msgstr ""
+msgstr "SSL-varmenne palvelulle “{0}” ei ole luotettu."
 
 #: ../src/shell/shell.error.xml.h:27
 msgid "Reason: {1}"
@@ -26979,7 +27257,7 @@ msgstr "MD5-sormenjälki"
 msgid "Email Address"
 msgstr "Sähköpostiosoite"
 
-#: ../src/smime/gui/certificate-manager.c:663
+#: ../src/smime/gui/certificate-manager.c:648
 msgid "Select a file to backup your key and certificate..."
 msgstr "Valitse tiedosto varmuuskopioidaksesi avaimesi ja varmenteen..."
 
@@ -26988,47 +27266,47 @@ msgstr "Valitse tiedosto varmuuskopioidaksesi avaimesi ja varmenteen..."
 #. * when a user wants to backup one of her/his private keys/certificates.
 #. * For example: gnomedev-backup.p12
 #.
-#: ../src/smime/gui/certificate-manager.c:675
+#: ../src/smime/gui/certificate-manager.c:658
 #, c-format
 msgid "%s-backup.p12"
 msgstr "%s-varmuuskopio.p12"
 
-#: ../src/smime/gui/certificate-manager.c:741
+#: ../src/smime/gui/certificate-manager.c:721
 msgid "Backup Certificate"
 msgstr "Varmuuskopioi varmenne"
 
 #. filename selection
-#: ../src/smime/gui/certificate-manager.c:755
+#: ../src/smime/gui/certificate-manager.c:736
 msgid "_File name:"
 msgstr "_Tiedostonimi:"
 
 #. FIXME when gtk_file_chooser_button allows GTK_FILE_CHOOSER_ACTION_SAVE use it
-#: ../src/smime/gui/certificate-manager.c:760
+#: ../src/smime/gui/certificate-manager.c:741
 msgid "Please select a file..."
 msgstr "Valitse tiedosto..."
 
-#: ../src/smime/gui/certificate-manager.c:774
+#: ../src/smime/gui/certificate-manager.c:755
 msgid "_Include certificate chain in the backup"
 msgstr ""
 
 #. To Translators: this text was copied from Firefox
-#: ../src/smime/gui/certificate-manager.c:780
+#: ../src/smime/gui/certificate-manager.c:761
 msgid ""
 "The certificate backup password you set here protects the backup file that you are "
 "about to create.\n"
 "You must set this password to proceed with the backup."
 msgstr ""
 
-#: ../src/smime/gui/certificate-manager.c:799
+#: ../src/smime/gui/certificate-manager.c:780
 msgid "_Repeat Password:"
 msgstr "_Toista salasana:"
 
-#: ../src/smime/gui/certificate-manager.c:818
+#: ../src/smime/gui/certificate-manager.c:799
 msgid "Passwords do not match"
 msgstr "Salasanat eivät täsmää"
 
 #. To Translators: this text was copied from Firefox
-#: ../src/smime/gui/certificate-manager.c:826
+#: ../src/smime/gui/certificate-manager.c:807
 msgid ""
 "Important:\n"
 "If you forget your certificate backup password, you will not be able to restore "
@@ -27036,96 +27314,96 @@ msgid ""
 "Please record it in a safe location."
 msgstr ""
 
-#: ../src/smime/gui/certificate-manager.c:871
+#: ../src/smime/gui/certificate-manager.c:852
 msgid "No file name provided"
 msgstr "Tiedoston nimeä ei annettu"
 
-#: ../src/smime/gui/certificate-manager.c:875
+#: ../src/smime/gui/certificate-manager.c:856
 msgid "Failed to backup key and certificate"
 msgstr "Avaimen ja varmenteen varmuuskopiointi epäonnistui"
 
-#: ../src/smime/gui/certificate-manager.c:964
+#: ../src/smime/gui/certificate-manager.c:948
 msgid "Select a certificate to import..."
 msgstr "Valitse tuotava varmenne..."
 
-#: ../src/smime/gui/certificate-manager.c:1014
+#: ../src/smime/gui/certificate-manager.c:997
 msgid "Failed to import certificate"
 msgstr "Varmenteen tuonti epäonnistui"
 
-#: ../src/smime/gui/certificate-manager.c:1130
+#: ../src/smime/gui/certificate-manager.c:1114
 msgctxt "CamelTrust"
 msgid "Ask when used"
 msgstr "Kysy käytettäessä"
 
-#: ../src/smime/gui/certificate-manager.c:1132
+#: ../src/smime/gui/certificate-manager.c:1116
 msgctxt "CamelTrust"
 msgid "Never"
 msgstr "Ei koskaan"
 
-#: ../src/smime/gui/certificate-manager.c:1134
+#: ../src/smime/gui/certificate-manager.c:1118
 msgctxt "CamelTrust"
 msgid "Marginally"
 msgstr ""
 
-#: ../src/smime/gui/certificate-manager.c:1136
+#: ../src/smime/gui/certificate-manager.c:1120
 msgctxt "CamelTrust"
 msgid "Fully"
 msgstr ""
 
-#: ../src/smime/gui/certificate-manager.c:1138
+#: ../src/smime/gui/certificate-manager.c:1122
 msgctxt "CamelTrust"
 msgid "Ultimately"
 msgstr ""
 
-#: ../src/smime/gui/certificate-manager.c:1140
+#: ../src/smime/gui/certificate-manager.c:1124
 msgctxt "CamelTrust"
 msgid "Temporarily"
 msgstr "Väliaikaisesti"
 
-#: ../src/smime/gui/certificate-manager.c:1346
+#: ../src/smime/gui/certificate-manager.c:1330
 msgid "Change certificate trust"
 msgstr "Muuta varmenteen luotettavuutta"
 
-#: ../src/smime/gui/certificate-manager.c:1358
+#: ../src/smime/gui/certificate-manager.c:1342
 #, c-format
 msgid "Change trust for the host “%s”:"
 msgstr ""
 
-#: ../src/smime/gui/certificate-manager.c:1382
+#: ../src/smime/gui/certificate-manager.c:1366
 msgctxt "CamelTrust"
 msgid "_Ask when used"
 msgstr "_Kysy käytettäessä"
 
-#: ../src/smime/gui/certificate-manager.c:1383
+#: ../src/smime/gui/certificate-manager.c:1367
 msgctxt "CamelTrust"
 msgid "_Never trust this certificate"
 msgstr "_Älä koskaan luota tähän varmenteeseen"
 
-#: ../src/smime/gui/certificate-manager.c:1384
+#: ../src/smime/gui/certificate-manager.c:1368
 msgctxt "CamelTrust"
 msgid "_Temporarily trusted (this session only)"
 msgstr "_Luota väliaikaisesti (tämän käyttökerran ajan)"
 
-#: ../src/smime/gui/certificate-manager.c:1385
+#: ../src/smime/gui/certificate-manager.c:1369
 msgctxt "CamelTrust"
 msgid "_Marginally trusted"
 msgstr ""
 
-#: ../src/smime/gui/certificate-manager.c:1386
+#: ../src/smime/gui/certificate-manager.c:1370
 #, fuzzy
 #| msgid "R_eply requested"
 msgctxt "CamelTrust"
 msgid "_Fully trusted"
 msgstr "V_astausta pyydetty"
 
-#: ../src/smime/gui/certificate-manager.c:1387
+#: ../src/smime/gui/certificate-manager.c:1371
 #, fuzzy
 #| msgid "R_eply requested"
 msgctxt "CamelTrust"
 msgid "_Ultimately trusted"
 msgstr "V_astausta pyydetty"
 
-#: ../src/smime/gui/certificate-manager.c:1391
+#: ../src/smime/gui/certificate-manager.c:1375
 #, fuzzy
 #| msgid ""
 #| "Before trusting this CA for any purpose, you should examine its certificate and "
@@ -27137,47 +27415,47 @@ msgstr ""
 "Ennen kuin luotat tähän CA:han missään tarkoituksessa, tulisi sinun tutkia "
 "varmenne tarkasti."
 
-#: ../src/smime/gui/certificate-manager.c:1406
+#: ../src/smime/gui/certificate-manager.c:1390
 msgid "_Display certificate"
 msgstr "_Näytä varmenne"
 
-#: ../src/smime/gui/certificate-manager.c:1611
+#: ../src/smime/gui/certificate-manager.c:1595
 #, fuzzy
 #| msgid "You have certificates on file that identify these people:"
 msgid "You have certificates on file that identify these mail servers:"
 msgstr "Seuraavat henkilöt voidaan tunnistaa tallentamistasi varmenteista:"
 
-#: ../src/smime/gui/certificate-manager.c:1642
+#: ../src/smime/gui/certificate-manager.c:1626
 #, fuzzy
 #| msgid "_List name:"
 msgid "Host name"
 msgstr "_Listan nimi:"
 
-#: ../src/smime/gui/certificate-manager.c:1644
+#: ../src/smime/gui/certificate-manager.c:1628
 msgid "Issuer"
 msgstr "Myöntäjä"
 
-#: ../src/smime/gui/certificate-manager.c:1645
+#: ../src/smime/gui/certificate-manager.c:1629
 msgid "Fingerprint"
 msgstr "Sormenjälki"
 
-#: ../src/smime/gui/certificate-manager.c:1646
+#: ../src/smime/gui/certificate-manager.c:1630
 msgid "Trust"
 msgstr ""
 
-#: ../src/smime/gui/certificate-manager.c:1667
+#: ../src/smime/gui/certificate-manager.c:1651
 msgid "_Edit Trust"
 msgstr "_Muokkaa luottamusta"
 
-#: ../src/smime/gui/certificate-manager.c:2121
+#: ../src/smime/gui/certificate-manager.c:2105
 msgid "All PKCS12 files"
 msgstr "Kaikki PKCS12-tiedostot"
 
-#: ../src/smime/gui/certificate-manager.c:2138
+#: ../src/smime/gui/certificate-manager.c:2122
 msgid "All email certificate files"
 msgstr "Kaikki sähköpostivarmennetiedostot"
 
-#: ../src/smime/gui/certificate-manager.c:2155
+#: ../src/smime/gui/certificate-manager.c:2139
 msgid "All CA certificate files"
 msgstr "Kaikki CA-varmenteiden tiedostot"
 
@@ -27304,16 +27582,12 @@ msgstr "Älä luota tämän varmenteen oikeellisuuteen"
 msgid "C_ertificate:"
 msgstr "_Varmenne:"
 
-#: ../src/smime/lib/e-cert.c:235 ../src/smime/lib/e-cert.c:247
-msgid "%d/%m/%Y"
-msgstr "%d.%m.%Y"
-
 #. x509 certificate usage types
-#: ../src/smime/lib/e-cert.c:403
+#: ../src/smime/lib/e-cert.c:400
 msgid "Sign"
 msgstr "Allekirjoita"
 
-#: ../src/smime/lib/e-cert.c:404
+#: ../src/smime/lib/e-cert.c:401
 msgid "Encrypt"
 msgstr "Salaa"
 
@@ -27362,6 +27636,12 @@ msgstr "Resurssin varaaminen ei onnistu, virhe: %s"
 msgid "Imported Certificate"
 msgstr "Tuotu varmenne"
 
+#~ msgid "Summary:"
+#~ msgstr "Kuvaus:"
+
+#~ msgid "%d/%m/%Y"
+#~ msgstr "%d.%m.%Y"
+
 #, fuzzy
 #~| msgid "Default reminder value"
 #~ msgid "Default reminder snooze interval, in minutes"
@@ -27739,9 +28019,6 @@ msgstr "Tuotu varmenne"
 #~ msgid "Whether editor changed"
 #~ msgstr "Näytetäänkö esikatselupaneeli."
 
-#~ msgid "_Unsort"
-#~ msgstr "Poista _järjestys"
-
 #~ msgid "Canceled."
 #~ msgstr "Peruttu."
 
@@ -27912,9 +28189,6 @@ msgstr "Tuotu varmenne"
 #~ msgid "Could not get a selection to modify."
 #~ msgstr "Valintaa ei voi hakea muokattavaksi."
 
-#~ msgid "Could not get a selection to delete."
-#~ msgstr "Valintaa ei voitu hakea poistettavaksi."
-
 #~ msgid "Date/Time"
 #~ msgstr "Päiväys/aika"
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]