Merge translation files from master branch.

3 files changed, 894 insertions, 894 deletions

diff --git a/tde-i18n-en_GB/messages/tdepim/kmail.po b/tde-i18n-en_GB/messages/tdepim/kmail.po
index 9ab2f388b71..8d126c35e09 100644
--- a/tde-i18n-en_GB/messages/tdepim/kmail.po
+++ b/tde-i18n-en_GB/messages/tdepim/kmail.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmail\n"
-"POT-Creation-Date: 2020-05-11 13:04+0200\n"
+"POT-Creation-Date: 2020-09-27 21:14+0200\n"
 "PO-Revision-Date: 2006-03-12 17:42+0000\n"
 "Last-Translator: Malcolm Hunter <malcolm.hunter@gmx.co.uk>\n"
 "Language-Team: British English <kde-en-gb@kde.me.uk>\n"
@@ -101,7 +101,7 @@ msgstr "timestamp for 'Transmission completed' status messages"
 msgid "multiple encryption keys per address"
 msgstr "multiple encryption keys per address"
 
-#: aboutdata.cpp:212 kmreaderwin.cpp:1303 kmstartup.cpp:149
+#: aboutdata.cpp:212 kmreaderwin.cpp:1302 kmstartup.cpp:149
 #: mailinglistpropertiesdialog.cpp:97
 msgid "KMail"
 msgstr "KMail"
@@ -235,7 +235,7 @@ msgid "Account Type: POP Account"
 msgstr "Account Type: POP Account"
 
 #: accountdialog.cpp:582 accountdialog.cpp:851 configuredialog.cpp:2550
-#: identitydialog.cpp:112 kmfilterdlg.cpp:164 kmtransport.cpp:376
+#: identitydialog.cpp:112 kmfilterdlg.cpp:163 kmtransport.cpp:376
 msgid "&General"
 msgstr "&General"
 
@@ -341,7 +341,7 @@ msgstr "&Extras"
 msgid "Check &What the Server Supports"
 msgstr "Check &What the Server Supports"
 
-#: accountdialog.cpp:782 accountdialog.cpp:1097 kmheaders.cpp:140
+#: accountdialog.cpp:782 accountdialog.cpp:1097 kmheaders.cpp:139
 #: kmtransport.cpp:502
 msgid "Encryption"
 msgstr "Encryption"
@@ -530,7 +530,7 @@ msgstr "<none>"
 
 #: accountdialog.cpp:1421 accountdialog.cpp:1428 kmfoldercachedimap.cpp:258
 #: kmfoldercachedimap.cpp:2255 kmfolderimap.cpp:200 kmfolderimap.cpp:901
-#: kmkernel.cpp:1439 subscriptiondialog.cpp:172
+#: kmkernel.cpp:1438 subscriptiondialog.cpp:172
 msgid "inbox"
 msgstr "inbox"
 
@@ -828,13 +828,13 @@ msgstr "Sendmail"
 msgid "Check for supported security capabilities of %1..."
 msgstr "Check for supported security capabilities of %1..."
 
-#: actionscheduler.cpp:598 kmfiltermgr.cpp:150 kmfiltermgr.cpp:253
-#: kmfiltermgr.cpp:291
+#: actionscheduler.cpp:598 kmfiltermgr.cpp:149 kmfiltermgr.cpp:252
+#: kmfiltermgr.cpp:290
 msgid "<b>Evaluating filter rules:</b> "
 msgstr "<b>Evaluating filter rules:</b> "
 
-#: actionscheduler.cpp:605 kmfiltermgr.cpp:157 kmfiltermgr.cpp:260
-#: kmfiltermgr.cpp:297
+#: actionscheduler.cpp:605 kmfiltermgr.cpp:156 kmfiltermgr.cpp:259
+#: kmfiltermgr.cpp:296
 msgid "<b>Filter rules have matched.</b>"
 msgstr "<b>Filter rules have matched.</b>"
 
@@ -1414,13 +1414,13 @@ msgstr "Outgoing accounts (add at least one):"
 
 #: configuredialog.cpp:607 configuredialog.cpp:1080 configuredialog.cpp:3403
 #: customtemplates_base.ui:89 distributionlistdialog.cpp:116
-#: favoritefolderview.cpp:389 kmcomposewin.cpp:397 recipientspicker.cpp:389
+#: favoritefolderview.cpp:389 kmcomposewin.cpp:396 recipientspicker.cpp:389
 #, no-c-format
 msgid "Name"
 msgstr "Name"
 
 #: configuredialog.cpp:608 configuredialog.cpp:1081 customtemplates_base.ui:78
-#: kmcomposewin.cpp:400 kmfilterdlg.cpp:218 kmmimeparttree.cpp:65
+#: kmcomposewin.cpp:399 kmfilterdlg.cpp:217 kmmimeparttree.cpp:65
 #, no-c-format
 msgid "Type"
 msgstr "Type"
@@ -1442,7 +1442,7 @@ msgstr "Set Default"
 msgid "Common Options"
 msgstr "Common Options"
 
-#: configuredialog.cpp:661 kmail.kcfg:412
+#: configuredialog.cpp:661 kmail.kcfg:408
 #, no-c-format
 msgid "Confirm &before send"
 msgstr "Confirm &before send"
@@ -1673,7 +1673,7 @@ msgstr "Quoted Text - Third Level"
 msgid "Fixed Width Font"
 msgstr "Fixed Width Font"
 
-#: configuredialog.cpp:1549 kmcomposewin.cpp:386
+#: configuredialog.cpp:1549 kmcomposewin.cpp:385
 msgid "Composer"
 msgstr "Composer"
 
@@ -1978,7 +1978,7 @@ msgstr "Show HTML stat&us bar"
 msgid "Show s&pam status in fancy headers"
 msgstr "Show s&pam status in fancy headers"
 
-#: configuredialog.cpp:2233 kmail.kcfg:583
+#: configuredialog.cpp:2233 kmail.kcfg:579
 #, no-c-format
 msgid "Replace smileys by emoticons"
 msgstr "Replace smileys by emoticons"
@@ -1987,7 +1987,7 @@ msgstr "Replace smileys by emoticons"
 msgid "Use smaller font for quoted text"
 msgstr "Use smaller font for quoted text"
 
-#: configuredialog.cpp:2241 kmail.kcfg:588
+#: configuredialog.cpp:2241 kmail.kcfg:584
 #, no-c-format
 msgid "Show expand/collapse quote marks"
 msgstr "Show expand/collapse quote marks"
@@ -2005,7 +2005,7 @@ msgstr ""
 msgid "Fallback ch&aracter encoding:"
 msgstr "Fallback ch&aracter encoding:"
 
-#: configuredialog.cpp:2338 configuredialog.cpp:2400 kmreaderwin.cpp:584
+#: configuredialog.cpp:2338 configuredialog.cpp:2400 kmreaderwin.cpp:583
 msgid "Auto"
 msgstr "Auto"
 
@@ -2013,7 +2013,7 @@ msgstr "Auto"
 msgid "&Override character encoding:"
 msgstr "&Override character encoding:"
 
-#: configuredialog.cpp:2486 kmail.kcfg:105
+#: configuredialog.cpp:2486 kmail.kcfg:104
 #, no-c-format
 msgid "Enable system tray icon"
 msgstr "Enable system tray icon"
@@ -2102,11 +2102,11 @@ msgstr "Has Attachment"
 msgid "Configure Completion Order"
 msgstr "Configure Completion Order"
 
-#: configuredialog.cpp:2761 kmlineeditspell.cpp:159
+#: configuredialog.cpp:2761 kmlineeditspell.cpp:158
 msgid "Edit Recent Addresses..."
 msgstr "Edit Recent Addresses..."
 
-#: configuredialog.cpp:2768 kmedit.cpp:633
+#: configuredialog.cpp:2768 kmedit.cpp:632
 msgid "External Editor"
 msgstr "External Editor"
 
@@ -2157,15 +2157,15 @@ msgstr "&Forward:"
 msgid "&Quote indicator:"
 msgstr "&Quote indicator:"
 
-#: configuredialog.cpp:3035 kmmessage.cpp:4051
+#: configuredialog.cpp:3035 kmmessage.cpp:4050
 msgid "On %D, you wrote:"
 msgstr "On %D, you wrote:"
 
-#: configuredialog.cpp:3036 kmmessage.cpp:4053
+#: configuredialog.cpp:3036 kmmessage.cpp:4052
 msgid "On %D, %F wrote:"
 msgstr "On %D, %F wrote:"
 
-#: configuredialog.cpp:3037 kmmessage.cpp:4055
+#: configuredialog.cpp:3037 kmmessage.cpp:4054
 msgid "Forwarded Message"
 msgstr "Forwarded Message"
 
@@ -2241,7 +2241,7 @@ msgstr "Value"
 msgid "Ne&w"
 msgstr "Ne&w"
 
-#: configuredialog.cpp:3425 folderpropertiesdialog.ui:52 kmfolderdia.cpp:269
+#: configuredialog.cpp:3425 folderpropertiesdialog.ui:52 kmfolderdia.cpp:268
 #: kmmsgpartdlg.cpp:110 kmtransport.cpp:329 kmtransport.cpp:383
 #: newfolderdialog.cpp:80 snippetdlgbase.ui:100
 #, no-c-format
@@ -2252,7 +2252,7 @@ msgstr "&Name:"
 msgid "&Value:"
 msgstr "&Value:"
 
-#: configuredialog.cpp:3581 kmail.kcfg:389
+#: configuredialog.cpp:3581 kmail.kcfg:385
 #, no-c-format
 msgid "Outlook-compatible attachment naming"
 msgstr "Outlook-compatible attachment naming"
@@ -2278,13 +2278,13 @@ msgstr ""
 msgid "Enter new key word:"
 msgstr "Enter new key word:"
 
-#: configuredialog.cpp:3634 configuredialog.cpp:3635 kmcomposewin.cpp:2297
-#: kmcomposewin.cpp:2298
+#: configuredialog.cpp:3634 configuredialog.cpp:3635 kmcomposewin.cpp:2296
+#: kmcomposewin.cpp:2297
 msgid "attachment"
 msgstr "attachment"
 
-#: configuredialog.cpp:3636 configuredialog.cpp:3637 kmcomposewin.cpp:2299
-#: kmcomposewin.cpp:2300
+#: configuredialog.cpp:3636 configuredialog.cpp:3637 kmcomposewin.cpp:2298
+#: kmcomposewin.cpp:2299
 msgid "attached"
 msgstr "attached"
 
@@ -2464,7 +2464,7 @@ msgstr "Message Disposition Notifications"
 msgid "Send policy:"
 msgstr "Send policy:"
 
-#: configuredialog.cpp:3845 kmmessage.cpp:1381 kmmessage.cpp:1388
+#: configuredialog.cpp:3845 kmmessage.cpp:1380 kmmessage.cpp:1387
 msgid "&Ignore"
 msgstr "&Ignore"
 
@@ -2880,7 +2880,7 @@ msgid ""
 "compatible way."
 msgstr ""
 
-#: configuredialog.cpp:4970 kmail.kcfg:190
+#: configuredialog.cpp:4970 kmail.kcfg:189
 #, fuzzy, no-c-format
 msgid "Outlook compatible invitation reply comments"
 msgstr "Outlook-compatible attachment naming"
@@ -2891,7 +2891,7 @@ msgid ""
 "understands."
 msgstr ""
 
-#: configuredialog.cpp:4977 kmail.kcfg:196
+#: configuredialog.cpp:4977 kmail.kcfg:195
 #, no-c-format
 msgid "Automatic invitation sending"
 msgstr "Automatic invitation sending"
@@ -3343,7 +3343,7 @@ msgstr "No Folder Selected"
 msgid "Favorite Folders"
 msgstr "New Folder"
 
-#: favoritefolderview.cpp:337 kmfoldertree.cpp:1190 kmmainwidget.cpp:2790
+#: favoritefolderview.cpp:337 kmfoldertree.cpp:1190 kmmainwidget.cpp:2789
 msgid "&Assign Shortcut..."
 msgstr "&Assign Shortcut..."
 
@@ -3499,45 +3499,45 @@ msgstr ""
 "\"%2\" is the detailed error description."
 
 #: filterlogdlg.cpp:262 kmcommands.cpp:2769 kmcommands.cpp:2793
-#: kmmainwidget.cpp:1772 kmmainwidget.cpp:1789 urlhandlermanager.cpp:556
+#: kmmainwidget.cpp:1771 kmmainwidget.cpp:1788 urlhandlermanager.cpp:556
 msgid "KMail Error"
 msgstr "KMail Error"
 
-#: folderdiaacltab.cpp:78
+#: folderdiaacltab.cpp:77
 msgid ""
 "_: Permissions\n"
 "None"
 msgstr "None"
 
-#: folderdiaacltab.cpp:79
+#: folderdiaacltab.cpp:78
 msgid ""
 "_: Permissions\n"
 "Read"
 msgstr "Read"
 
-#: folderdiaacltab.cpp:80
+#: folderdiaacltab.cpp:79
 msgid ""
 "_: Permissions\n"
 "Append"
 msgstr "Append"
 
-#: folderdiaacltab.cpp:81
+#: folderdiaacltab.cpp:80
 msgid ""
 "_: Permissions\n"
 "Write"
 msgstr "Write"
 
-#: folderdiaacltab.cpp:82
+#: folderdiaacltab.cpp:81
 msgid ""
 "_: Permissions\n"
 "All"
 msgstr "All"
 
-#: folderdiaacltab.cpp:95
+#: folderdiaacltab.cpp:94
 msgid "&User identifier:"
 msgstr "&User identifier:"
 
-#: folderdiaacltab.cpp:101
+#: folderdiaacltab.cpp:100
 msgid ""
 "The User Identifier is the login of the user on the IMAP server. This can be "
 "a simple user name or the full email address of the user; the login for your "
@@ -3547,77 +3547,77 @@ msgstr ""
 "a simple user name or the full email address of the user; the login for your "
 "own account on the server will tell you which one it is."
 
-#: folderdiaacltab.cpp:103 recipientseditor.cpp:776
+#: folderdiaacltab.cpp:102 recipientseditor.cpp:776
 msgid "Se&lect..."
 msgstr "Se&lect..."
 
-#: folderdiaacltab.cpp:106 folderdiaacltab.cpp:340
+#: folderdiaacltab.cpp:105 folderdiaacltab.cpp:339
 msgid "Permissions"
 msgstr "Permissions"
 
-#: folderdiaacltab.cpp:118
+#: folderdiaacltab.cpp:117
 msgid "<b>Note: </b>Renaming requires write permissions on the parent folder."
 msgstr ""
 
-#: folderdiaacltab.cpp:245
+#: folderdiaacltab.cpp:244
 msgid "Custom Permissions"
 msgstr "Custom Permissions"
 
-#: folderdiaacltab.cpp:247
+#: folderdiaacltab.cpp:246
 msgid "Custom Permissions (%1)"
 msgstr "Custom Permissions (%1)"
 
-#: folderdiaacltab.cpp:339
+#: folderdiaacltab.cpp:338
 msgid "User Id"
 msgstr "User Id"
 
-#: folderdiaacltab.cpp:351
+#: folderdiaacltab.cpp:350
 msgid "Add Entry..."
 msgstr "Add Entry..."
 
-#: folderdiaacltab.cpp:352
+#: folderdiaacltab.cpp:351
 msgid "Modify Entry..."
 msgstr "Modify Entry..."
 
-#: folderdiaacltab.cpp:353
+#: folderdiaacltab.cpp:352
 msgid "Remove Entry"
 msgstr "Remove Entry"
 
-#: folderdiaacltab.cpp:428
+#: folderdiaacltab.cpp:427
 msgid "Error retrieving user permissions."
 msgstr "Error retrieving user permissions."
 
-#: folderdiaacltab.cpp:430
+#: folderdiaacltab.cpp:429
 #, fuzzy
 msgid ""
 "You might not have enough permissions to see the permissions of this folder."
 msgstr "You do not have read/write permission to your wastebin folder."
 
-#: folderdiaacltab.cpp:435
+#: folderdiaacltab.cpp:434
 #, fuzzy
 msgid ""
 "Information not retrieved from server, you need to use \"Check Mail\" and "
 "have administrative privileges on the folder."
 msgstr "Information not retrieved from server yet, please use \"Check Mail\"."
 
-#: folderdiaacltab.cpp:450 folderdiaquotatab.cpp:114
+#: folderdiaacltab.cpp:449 folderdiaquotatab.cpp:113
 msgid "Error: no IMAP account defined for this folder"
 msgstr "Error: no IMAP account defined for this folder"
 
-#: folderdiaacltab.cpp:456 folderdiaquotatab.cpp:120
+#: folderdiaacltab.cpp:455 folderdiaquotatab.cpp:119
 msgid "Connecting to server %1, please wait..."
 msgstr "Connecting to server %1, please wait..."
 
-#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139 kmfoldercachedimap.cpp:902
+#: folderdiaacltab.cpp:473 folderdiaquotatab.cpp:138 kmfoldercachedimap.cpp:902
 #, c-format
 msgid "Error connecting to server %1"
 msgstr "Error connecting to server %1"
 
-#: folderdiaacltab.cpp:494 folderdiaacltab.cpp:522
+#: folderdiaacltab.cpp:493 folderdiaacltab.cpp:521
 msgid "This IMAP server does not have support for access control lists (ACL)"
 msgstr "This IMAP server does not have support for access control lists (ACL)"
 
-#: folderdiaacltab.cpp:524
+#: folderdiaacltab.cpp:523
 #, c-format
 msgid ""
 "Error retrieving access control list (ACL) from server\n"
@@ -3626,15 +3626,15 @@ msgstr ""
 "Error retrieving access control list (ACL) from server\n"
 "%1"
 
-#: folderdiaacltab.cpp:569
+#: folderdiaacltab.cpp:568
 msgid "Modify Permissions"
 msgstr "Modify Permissions"
 
-#: folderdiaacltab.cpp:603
+#: folderdiaacltab.cpp:602
 msgid "Add Permissions"
 msgstr "Add Permissions"
 
-#: folderdiaacltab.cpp:636
+#: folderdiaacltab.cpp:635
 msgid ""
 "Do you really want to remove your own permissions for this folder? You will "
 "not be able to access it afterwards."
@@ -3642,11 +3642,11 @@ msgstr ""
 "Do you really want to remove your own permissions for this folder? You will "
 "not be able to access it afterwards."
 
-#: folderdiaquotatab.cpp:163 folderdiaquotatab.cpp:177
+#: folderdiaquotatab.cpp:162 folderdiaquotatab.cpp:176
 msgid "This account does not have support for quota information."
 msgstr ""
 
-#: folderdiaquotatab.cpp:165
+#: folderdiaquotatab.cpp:164
 #, fuzzy, c-format
 msgid ""
 "Error retrieving quota information from server\n"
@@ -3655,7 +3655,7 @@ msgstr ""
 "Error retrieving access control list (ACL) from server\n"
 "%1"
 
-#: folderdiaquotatab.cpp:184
+#: folderdiaquotatab.cpp:183
 msgid "No quota is set for this folder."
 msgstr ""
 
@@ -3704,7 +3704,7 @@ msgstr ""
 "folder, click the button below and then press the key(s) you wish to "
 "associate with this folder.</qt>"
 
-#: foldershortcutdialog.cpp:91 kmfilterdlg.cpp:530 snippetdlg.cpp:100
+#: foldershortcutdialog.cpp:91 kmfilterdlg.cpp:529 snippetdlg.cpp:100
 msgid "The selected shortcut is already used, please select a different one."
 msgstr "The selected shortcut is already used, please select a different one."
 
@@ -3745,7 +3745,7 @@ msgstr "Unknown"
 
 #: headeritem.cpp:193 headerstyle.cpp:141 headerstyle.cpp:240
 #: headerstyle.cpp:445 headerstyle.cpp:743 headerstyle.cpp:898
-#: kmmainwidget.cpp:1029
+#: kmmainwidget.cpp:1028
 msgid "No Subject"
 msgstr "No Subject"
 
@@ -4135,12 +4135,12 @@ msgstr "&Wastebin folder:"
 msgid "Special &transport:"
 msgstr "Special &transport:"
 
-#: identitydialog.cpp:410 kmfolderdia.cpp:808
+#: identitydialog.cpp:410 kmfolderdia.cpp:807
 #, fuzzy
 msgid "&Use custom message templates"
 msgstr "&Use custom message-id suffix"
 
-#: identitydialog.cpp:416 kmfolderdia.cpp:816
+#: identitydialog.cpp:416 kmfolderdia.cpp:815
 msgid "&Copy global templates"
 msgstr ""
 
@@ -4152,7 +4152,7 @@ msgstr "&Signature"
 msgid "&Picture"
 msgstr "&Picture"
 
-#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4116
+#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4115
 msgid "Invalid Email Address"
 msgstr "Invalid Email Address"
 
@@ -5153,7 +5153,7 @@ msgstr "Checking account: "
 msgid " completed"
 msgstr " completed"
 
-#: kmacctimap.cpp:607 kmheaders.cpp:1313
+#: kmacctimap.cpp:607 kmheaders.cpp:1312
 msgid "Unable to process messages: "
 msgstr "Unable to process messages: "
 
@@ -5232,71 +5232,71 @@ msgstr "&Disconnected IMAP"
 msgid "&Maildir mailbox"
 msgstr "&Maildir mailbox"
 
-#: kmail_options.h:11
+#: kmail_options.h:10
 msgid "Set subject of message"
 msgstr "Set subject of message"
 
-#: kmail_options.h:13
+#: kmail_options.h:12
 msgid "Send CC: to 'address'"
 msgstr "Send CC: to 'address'"
 
-#: kmail_options.h:15
+#: kmail_options.h:14
 msgid "Send BCC: to 'address'"
 msgstr "Send BCC: to 'address'"
 
-#: kmail_options.h:17
+#: kmail_options.h:16
 msgid "Add 'header' to message"
 msgstr "Add 'header' to message"
 
-#: kmail_options.h:18
+#: kmail_options.h:17
 msgid "Read message body from 'file'"
 msgstr "Read message body from 'file'"
 
-#: kmail_options.h:19
+#: kmail_options.h:18
 msgid "Set body of message"
 msgstr "Set body of message"
 
-#: kmail_options.h:20
+#: kmail_options.h:19
 msgid "Add an attachment to the mail. This can be repeated"
 msgstr "Add an attachment to the mail. This can be repeated"
 
-#: kmail_options.h:21
+#: kmail_options.h:20
 msgid "Only check for new mail"
 msgstr "Only check for new mail"
 
-#: kmail_options.h:22
+#: kmail_options.h:21
 msgid "Only open composer window"
 msgstr "Only open composer window"
 
-#: kmail_options.h:23
+#: kmail_options.h:22
 msgid "View the given message file"
 msgstr "View the given message file"
 
-#: kmail_options.h:24
+#: kmail_options.h:23
 msgid "Send message to 'address' resp. attach the file the 'URL' points to"
 msgstr "Send message to 'address' resp. attach the file the 'URL' points to"
 
-#: kmailicalifaceimpl.cpp:93 kmfolderdia.cpp:506 newfolderdialog.cpp:130
+#: kmailicalifaceimpl.cpp:93 kmfolderdia.cpp:505 newfolderdialog.cpp:130
 msgid "Mail"
 msgstr "Mail"
 
-#: kmailicalifaceimpl.cpp:94 kmfolderdia.cpp:507 newfolderdialog.cpp:131
+#: kmailicalifaceimpl.cpp:94 kmfolderdia.cpp:506 newfolderdialog.cpp:131
 msgid "Calendar"
 msgstr "Calendar"
 
-#: kmailicalifaceimpl.cpp:95 kmfolderdia.cpp:508 newfolderdialog.cpp:132
+#: kmailicalifaceimpl.cpp:95 kmfolderdia.cpp:507 newfolderdialog.cpp:132
 msgid "Contacts"
 msgstr "Contacts"
 
-#: kmailicalifaceimpl.cpp:96 kmfolderdia.cpp:509 newfolderdialog.cpp:133
+#: kmailicalifaceimpl.cpp:96 kmfolderdia.cpp:508 newfolderdialog.cpp:133
 msgid "Notes"
 msgstr "Notes"
 
-#: kmailicalifaceimpl.cpp:97 kmfolderdia.cpp:510 newfolderdialog.cpp:134
+#: kmailicalifaceimpl.cpp:97 kmfolderdia.cpp:509 newfolderdialog.cpp:134
 msgid "Tasks"
 msgstr "Tasks"
 
-#: kmailicalifaceimpl.cpp:98 kmfolderdia.cpp:511 newfolderdialog.cpp:135
+#: kmailicalifaceimpl.cpp:98 kmfolderdia.cpp:510 newfolderdialog.cpp:135
 msgid "Journal"
 msgstr "Journal"
 
@@ -5387,11 +5387,11 @@ msgstr "URL copied to clipboard."
 msgid "<qt>File <b>%1</b> exists.<br>Do you want to replace it?</qt>"
 msgstr "<qt>File <b>%1</b> exists.<br>Do you want to replace it?</qt>"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2064
 msgid "Save to File"
 msgstr "Save to File"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2064
 msgid "&Replace"
 msgstr "&Replace"
 
@@ -5409,7 +5409,7 @@ msgstr ""
 msgid "The message was removed while saving it. It has not been saved."
 msgstr ""
 
-#: kmcommands.cpp:965 kmkernel.cpp:2064
+#: kmcommands.cpp:965 kmkernel.cpp:2063
 msgid ""
 "File %1 exists.\n"
 "Do you want to replace it?"
@@ -5443,12 +5443,12 @@ msgstr ""
 "\n"
 "\n"
 
-#: kmcommands.cpp:1747 kmheaders.cpp:1445
+#: kmcommands.cpp:1747 kmheaders.cpp:1444
 #, fuzzy
 msgid "Filtering messages"
 msgstr "Deleting messages"
 
-#: kmcommands.cpp:1755 kmheaders.cpp:1453
+#: kmcommands.cpp:1755 kmheaders.cpp:1452
 #, fuzzy
 msgid "Filtering message %1 of %2"
 msgstr "Moving message %3 of %2 from %1."
@@ -5587,7 +5587,7 @@ msgstr ""
 " %1\n"
 " it is not possible to determine who to chat with."
 
-#: kmcommands.cpp:3244 kmcomposewin.cpp:5316 objecttreeparser.cpp:1858
+#: kmcommands.cpp:3244 kmcomposewin.cpp:5315 objecttreeparser.cpp:1858
 msgid ""
 "Chiasmus backend does not offer the \"x-obtain-keys\" function. Please "
 "report this bug."
@@ -5597,13 +5597,13 @@ msgstr ""
 
 #: kmcommands.cpp:3246 kmcommands.cpp:3251 kmcommands.cpp:3260
 #: kmcommands.cpp:3269 kmcommands.cpp:3287 kmcommands.cpp:3298
-#: kmcommands.cpp:3338 kmcomposewin.cpp:5318 kmcomposewin.cpp:5323
-#: kmcomposewin.cpp:5332 messagecomposer.cpp:559 messagecomposer.cpp:567
+#: kmcommands.cpp:3338 kmcomposewin.cpp:5317 kmcomposewin.cpp:5322
+#: kmcomposewin.cpp:5331 messagecomposer.cpp:559 messagecomposer.cpp:567
 #: messagecomposer.cpp:581 objecttreeparser.cpp:1864
 msgid "Chiasmus Backend Error"
 msgstr "Chiasmus Backend Error"
 
-#: kmcommands.cpp:3257 kmcomposewin.cpp:5329 objecttreeparser.cpp:1870
+#: kmcommands.cpp:3257 kmcomposewin.cpp:5328 objecttreeparser.cpp:1870
 msgid ""
 "Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" "
 "function did not return a string list. Please report this bug."
@@ -5611,7 +5611,7 @@ msgstr ""
 "Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" "
 "function did not return a string list. Please report this bug."
 
-#: kmcommands.cpp:3266 kmcomposewin.cpp:5338 objecttreeparser.cpp:1878
+#: kmcommands.cpp:3266 kmcomposewin.cpp:5337 objecttreeparser.cpp:1878
 msgid ""
 "No keys have been found. Please check that a valid key path has been set in "
 "the Chiasmus configuration."
@@ -5663,117 +5663,117 @@ msgstr ""
 msgid "Mail: %1"
 msgstr "Mail"
 
-#: kmcomposewin.cpp:207
+#: kmcomposewin.cpp:206
 #, fuzzy
 msgid "Select an identity for this message"
 msgstr "Turn on HTML rendering for this message."
 
-#: kmcomposewin.cpp:211
+#: kmcomposewin.cpp:210
 msgid "Select the dictionary to use when spell-checking this message"
 msgstr ""
 
-#: kmcomposewin.cpp:216
+#: kmcomposewin.cpp:215
 msgid "Select the sent-mail folder where a copy of this message will be saved"
 msgstr ""
 
-#: kmcomposewin.cpp:220
+#: kmcomposewin.cpp:219
 msgid "Select the outgoing account to use for sending this message"
 msgstr ""
 
-#: kmcomposewin.cpp:224
+#: kmcomposewin.cpp:223
 msgid "Set the \"From:\" email address for this message"
 msgstr ""
 
-#: kmcomposewin.cpp:228
+#: kmcomposewin.cpp:227
 msgid "Set the \"Reply-To:\" email address for this message"
 msgstr ""
 
-#: kmcomposewin.cpp:248
+#: kmcomposewin.cpp:247
 msgid "Select email address(es)"
 msgstr "Select email address(es)"
 
-#: kmcomposewin.cpp:295
+#: kmcomposewin.cpp:294
 #, fuzzy
 msgid "Set a subject for this message"
 msgstr "Set subject of message"
 
-#: kmcomposewin.cpp:297
+#: kmcomposewin.cpp:296
 msgid "&Identity:"
 msgstr "&Identity:"
 
-#: kmcomposewin.cpp:298
+#: kmcomposewin.cpp:297
 msgid "&Dictionary:"
 msgstr "&Dictionary:"
 
-#: kmcomposewin.cpp:299
+#: kmcomposewin.cpp:298
 msgid "&Sent-Mail folder:"
 msgstr "&Sent-Mail folder:"
 
-#: kmcomposewin.cpp:300
+#: kmcomposewin.cpp:299
 msgid "&Mail transport:"
 msgstr "&Mail transport:"
 
-#: kmcomposewin.cpp:301
+#: kmcomposewin.cpp:300
 msgid ""
 "_: sender address field\n"
 "&From:"
 msgstr "&From:"
 
-#: kmcomposewin.cpp:302
+#: kmcomposewin.cpp:301
 msgid "&Reply to:"
 msgstr "&Reply to:"
 
-#: kmcomposewin.cpp:303
+#: kmcomposewin.cpp:302
 msgid "S&ubject:"
 msgstr "S&ubject:"
 
-#: kmcomposewin.cpp:305
+#: kmcomposewin.cpp:304
 msgid "Sticky"
 msgstr "Sticky"
 
-#: kmcomposewin.cpp:308
+#: kmcomposewin.cpp:307
 msgid "Use the selected value as your identity for future messages"
 msgstr ""
 
-#: kmcomposewin.cpp:311
+#: kmcomposewin.cpp:310
 msgid "Use the selected value as your sent-mail folder for future messages"
 msgstr ""
 
-#: kmcomposewin.cpp:314
+#: kmcomposewin.cpp:313
 msgid "Use the selected value as your outgoing account for future messages"
 msgstr ""
 
-#: kmcomposewin.cpp:317
+#: kmcomposewin.cpp:316
 msgid "Use the selected value as your dictionary for future messages"
 msgstr ""
 
-#: kmcomposewin.cpp:398 kmfoldertree.cpp:1719 kmheaders.cpp:141
-#: kmheaders.cpp:187 kmmainwidget.cpp:416 kmmainwidget.cpp:423
-#: kmmainwidget.cpp:430 kmmimeparttree.cpp:67 kmpopfiltercnfrmdlg.cpp:43
+#: kmcomposewin.cpp:397 kmfoldertree.cpp:1719 kmheaders.cpp:140
+#: kmheaders.cpp:186 kmmainwidget.cpp:415 kmmainwidget.cpp:422
+#: kmmainwidget.cpp:429 kmmimeparttree.cpp:67 kmpopfiltercnfrmdlg.cpp:43
 msgid "Size"
 msgstr "Size"
 
-#: kmcomposewin.cpp:399 kmmimeparttree.cpp:66
+#: kmcomposewin.cpp:398 kmmimeparttree.cpp:66
 msgid "Encoding"
 msgstr "Encoding"
 
-#: kmcomposewin.cpp:406 kmcomposewin.cpp:3326
+#: kmcomposewin.cpp:405 kmcomposewin.cpp:3325
 msgid "Compress"
 msgstr "Compress"
 
-#: kmcomposewin.cpp:408
+#: kmcomposewin.cpp:407
 msgid "Encrypt"
 msgstr "Encrypt"
 
-#: kmcomposewin.cpp:410
+#: kmcomposewin.cpp:409
 msgid "Sign"
 msgstr "Sign"
 
-#: kmcomposewin.cpp:621 kmcomposewin.cpp:3702
+#: kmcomposewin.cpp:620 kmcomposewin.cpp:3701
 msgid "Name of the attachment:"
 msgstr "Name of the attachment:"
 
-#: kmcomposewin.cpp:868
+#: kmcomposewin.cpp:867
 msgid ""
 "Autosaving the message as %1 failed.\n"
 "Reason: %2"
@@ -5781,15 +5781,15 @@ msgstr ""
 "Autosaving the message as %1 failed.\n"
 "Reason: %2"
 
-#: kmcomposewin.cpp:872
+#: kmcomposewin.cpp:871
 msgid "Autosaving Failed"
 msgstr "Autosaving Failed"
 
-#: kmcomposewin.cpp:1042
+#: kmcomposewin.cpp:1041
 msgid "Primary Recipients"
 msgstr "Primary Recipients"
 
-#: kmcomposewin.cpp:1043
+#: kmcomposewin.cpp:1042
 msgid ""
 "<qt>The email addresses you put in this field receive a copy of the email.</"
 "qt>"
@@ -5797,11 +5797,11 @@ msgstr ""
 "<qt>The email addresses you put in this field receive a copy of the email.</"
 "qt>"
 
-#: kmcomposewin.cpp:1052
+#: kmcomposewin.cpp:1051
 msgid "Additional Recipients"
 msgstr "Additional Recipients"
 
-#: kmcomposewin.cpp:1053
+#: kmcomposewin.cpp:1052
 msgid ""
 "<qt>The email addresses you put in this field receive a copy of the email. "
 "Technically it is the same thing as putting all the addresses in the <b>To:</"
@@ -5813,11 +5813,11 @@ msgstr ""
 "b> field but differs in that it usually symbolises the receiver of the "
 "Carbon Copy (CC) is a listener, not the main recipient.</qt>"
 
-#: kmcomposewin.cpp:1067
+#: kmcomposewin.cpp:1066
 msgid "Hidden Recipients"
 msgstr "Hidden Recipients"
 
-#: kmcomposewin.cpp:1068
+#: kmcomposewin.cpp:1067
 msgid ""
 "<qt>Essentially the same thing as the <b>Copy To:</b> field but differs in "
 "that all other recipients do not see who receives a blind copy.</qt>"
@@ -5825,330 +5825,330 @@ msgstr ""
 "<qt>Essentially the same thing as the <b>Copy To:</b> field but differs in "
 "that all other recipients do not see who receives a blind copy.</qt>"
 
-#: kmcomposewin.cpp:1236 kmcomposewin.cpp:1258
+#: kmcomposewin.cpp:1235 kmcomposewin.cpp:1257
 msgid "&Send Mail"
 msgstr "&Send Mail"
 
-#: kmcomposewin.cpp:1240 kmcomposewin.cpp:1262
+#: kmcomposewin.cpp:1239 kmcomposewin.cpp:1261
 msgid "&Send Mail Via"
 msgstr "&Send Mail Via"
 
-#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4458
+#: kmcomposewin.cpp:1242 kmcomposewin.cpp:1251 kmcomposewin.cpp:4457
 #: redirectdialog.cpp:84
 msgid "Send &Later"
 msgstr "Send &Later"
 
-#: kmcomposewin.cpp:1245 kmcomposewin.cpp:1255
+#: kmcomposewin.cpp:1244 kmcomposewin.cpp:1254
 msgid "Send &Later Via"
 msgstr "Send &Later Via"
 
-#: kmcomposewin.cpp:1293
+#: kmcomposewin.cpp:1292
 #, fuzzy
 msgid "Save as &Draft"
 msgstr "&Save as Draft"
 
-#: kmcomposewin.cpp:1296
+#: kmcomposewin.cpp:1295
 #, fuzzy
 msgid "Save as &Template"
 msgstr "&Replace"
 
-#: kmcomposewin.cpp:1299
+#: kmcomposewin.cpp:1298
 msgid "&Insert File..."
 msgstr "&Insert File..."
 
-#: kmcomposewin.cpp:1302
+#: kmcomposewin.cpp:1301
 msgid "&Insert File Recent"
 msgstr "&Insert File Recent"
 
-#: kmcomposewin.cpp:1309
+#: kmcomposewin.cpp:1308
 msgid "&Address Book"
 msgstr "&Address Book"
 
-#: kmcomposewin.cpp:1312
+#: kmcomposewin.cpp:1311
 msgid "&New Composer"
 msgstr "&New Composer"
 
-#: kmcomposewin.cpp:1316
+#: kmcomposewin.cpp:1315
 msgid "New Main &Window"
 msgstr "New Main &Window"
 
-#: kmcomposewin.cpp:1321
+#: kmcomposewin.cpp:1320
 msgid "Select &Recipients..."
 msgstr "Select &Recipients..."
 
-#: kmcomposewin.cpp:1323
+#: kmcomposewin.cpp:1322
 msgid "Save &Distribution List..."
 msgstr "Save &Distribution List..."
 
-#: kmcomposewin.cpp:1345
+#: kmcomposewin.cpp:1344
 msgid "Pa&ste as Quotation"
 msgstr "Pa&ste as Quotation"
 
-#: kmcomposewin.cpp:1348
+#: kmcomposewin.cpp:1347
 msgid "Paste as Attac&hment"
 msgstr "Paste as Attac&hment"
 
-#: kmcomposewin.cpp:1351
+#: kmcomposewin.cpp:1350
 msgid "Add &Quote Characters"
 msgstr "Add &Quote Characters"
 
-#: kmcomposewin.cpp:1356
+#: kmcomposewin.cpp:1355
 msgid "Re&move Quote Characters"
 msgstr "Re&move Quote Characters"
 
-#: kmcomposewin.cpp:1362
+#: kmcomposewin.cpp:1361
 msgid "Cl&ean Spaces"
 msgstr "Cl&ean Spaces"
 
-#: kmail.kcfg:358 kmcomposewin.cpp:1365 kmreaderwin.cpp:617
+#: kmail.kcfg:354 kmcomposewin.cpp:1364 kmreaderwin.cpp:616
 #, no-c-format
 msgid "Use Fi&xed Font"
 msgstr "Use Fi&xed Font"
 
-#: kmcomposewin.cpp:1370
+#: kmcomposewin.cpp:1369
 msgid "&Urgent"
 msgstr "&Urgent"
 
-#: kmcomposewin.cpp:1373
+#: kmcomposewin.cpp:1372
 msgid "&Request Disposition Notification"
 msgstr "&Request Disposition Notification"
 
-#: kmcomposewin.cpp:1378
+#: kmcomposewin.cpp:1377
 msgid "Se&t Encoding"
 msgstr "Se&t Encoding"
 
-#: kmcomposewin.cpp:1381
+#: kmcomposewin.cpp:1380
 msgid "&Wordwrap"
 msgstr "&Wordwrap"
 
-#: kmcomposewin.cpp:1386
+#: kmcomposewin.cpp:1385
 msgid "&Snippets"
 msgstr ""
 
-#: kmcomposewin.cpp:1392
+#: kmcomposewin.cpp:1391
 msgid "&Automatic Spellchecking"
 msgstr "&Automatic Spellchecking"
 
-#: kmcomposewin.cpp:1402
+#: kmcomposewin.cpp:1401
 msgid "Auto-Detect"
 msgstr "Auto-Detect"
 
-#: kmcomposewin.cpp:1407
+#: kmcomposewin.cpp:1406
 msgid "Formatting (HTML)"
 msgstr "Formatting (HTML)"
 
-#: kmcomposewin.cpp:1411
+#: kmcomposewin.cpp:1410
 msgid "&All Fields"
 msgstr "&All Fields"
 
-#: kmcomposewin.cpp:1414
+#: kmcomposewin.cpp:1413
 msgid "&Identity"
 msgstr "&Identity"
 
-#: kmcomposewin.cpp:1417
+#: kmcomposewin.cpp:1416
 msgid "&Dictionary"
 msgstr "&Dictionary"
 
-#: kmcomposewin.cpp:1420
+#: kmcomposewin.cpp:1419
 msgid "&Sent-Mail Folder"
 msgstr "&Sent-Mail Folder"
 
-#: kmcomposewin.cpp:1423
+#: kmcomposewin.cpp:1422
 msgid "&Mail Transport"
 msgstr "&Mail Transport"
 
-#: kmcomposewin.cpp:1426
+#: kmcomposewin.cpp:1425
 msgid "&From"
 msgstr "&From"
 
-#: kmcomposewin.cpp:1429
+#: kmcomposewin.cpp:1428
 msgid "&Reply To"
 msgstr "&Reply To"
 
-#: kmcomposewin.cpp:1433
+#: kmcomposewin.cpp:1432
 msgid "&To"
 msgstr "&To"
 
-#: kmcomposewin.cpp:1436
+#: kmcomposewin.cpp:1435
 msgid "&CC"
 msgstr "&CC"
 
-#: kmcomposewin.cpp:1439
+#: kmcomposewin.cpp:1438
 msgid "&BCC"
 msgstr "&BCC"
 
-#: kmcomposewin.cpp:1443
+#: kmcomposewin.cpp:1442
 msgid "S&ubject"
 msgstr "S&ubject"
 
-#: kmcomposewin.cpp:1448
+#: kmcomposewin.cpp:1447
 msgid "Append S&ignature"
 msgstr "Append S&ignature"
 
-#: kmcomposewin.cpp:1451
+#: kmcomposewin.cpp:1450
 #, fuzzy
 msgid "Prepend S&ignature"
 msgstr "Append S&ignature"
 
-#: kmcomposewin.cpp:1455
+#: kmcomposewin.cpp:1454
 msgid "Insert Signature At C&ursor Position"
 msgstr ""
 
-#: kmcomposewin.cpp:1459
+#: kmcomposewin.cpp:1458
 msgid "Attach &Public Key..."
 msgstr "Attach &Public Key..."
 
-#: kmcomposewin.cpp:1462
+#: kmcomposewin.cpp:1461
 msgid "Attach &My Public Key"
 msgstr "Attach &My Public Key"
 
-#: kmcomposewin.cpp:1465 kmcomposewin.cpp:2337
+#: kmcomposewin.cpp:1464 kmcomposewin.cpp:2336
 msgid "&Attach File..."
 msgstr "&Attach File..."
 
-#: kmcomposewin.cpp:1468
+#: kmcomposewin.cpp:1467
 msgid "&Remove Attachment"
 msgstr "&Remove Attachment"
 
-#: kmcomposewin.cpp:1471
+#: kmcomposewin.cpp:1470
 msgid "&Save Attachment As..."
 msgstr "&Save Attachment As..."
 
-#: kmcomposewin.cpp:1474
+#: kmcomposewin.cpp:1473
 msgid "Attachment Pr&operties"
 msgstr "Attachment Pr&operties"
 
-#: kmcomposewin.cpp:1484
+#: kmcomposewin.cpp:1483
 msgid "&Spellchecker..."
 msgstr "&Spellchecker..."
 
-#: kmcomposewin.cpp:1488 kmcomposewin.cpp:1491
+#: kmcomposewin.cpp:1487 kmcomposewin.cpp:1490
 msgid "Encrypt Message with Chiasmus..."
 msgstr "Encrypt Message with Chiasmus..."
 
-#: kmcomposewin.cpp:1499
+#: kmcomposewin.cpp:1498
 msgid "&Encrypt Message"
 msgstr "&Encrypt Message"
 
-#: kmcomposewin.cpp:1502
+#: kmcomposewin.cpp:1501
 msgid "&Sign Message"
 msgstr "&Sign Message"
 
-#: kmcomposewin.cpp:1549
+#: kmcomposewin.cpp:1548
 msgid "&Cryptographic Message Format"
 msgstr "&Cryptographic Message Format"
 
-#: kmcomposewin.cpp:1554
+#: kmcomposewin.cpp:1553
 msgid "Select a cryptographic format for this message"
 msgstr ""
 
-#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5158
+#: kmcomposewin.cpp:1557 kmcomposewin.cpp:5157
 msgid "Standard"
 msgstr "Standard"
 
-#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5160
+#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5159
 msgid "Bulleted List (Disc)"
 msgstr "Bulleted List (Disc)"
 
-#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5162
+#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5161
 msgid "Bulleted List (Circle)"
 msgstr "Bulleted List (Circle)"
 
-#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5164
+#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5163
 msgid "Bulleted List (Square)"
 msgstr "Bulleted List (Square)"
 
-#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5166
+#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5165
 msgid "Ordered List (Decimal)"
 msgstr "Ordered List (Decimal)"
 
-#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5168
+#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5167
 msgid "Ordered List (Alpha lower)"
 msgstr "Ordered List (Alpha lower)"
 
-#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5170
+#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5169
 msgid "Ordered List (Alpha upper)"
 msgstr "Ordered List (Alpha upper)"
 
-#: kmcomposewin.cpp:1566
+#: kmcomposewin.cpp:1565
 msgid "Select Style"
 msgstr "Select Style"
 
-#: kmcomposewin.cpp:1569
+#: kmcomposewin.cpp:1568
 #, fuzzy
 msgid "Select a list style"
 msgstr "Select Style"
 
-#: kmcomposewin.cpp:1574
+#: kmcomposewin.cpp:1573
 #, fuzzy
 msgid "Select a font"
 msgstr "Select All Text"
 
-#: kmcomposewin.cpp:1579
+#: kmcomposewin.cpp:1578
 #, fuzzy
 msgid "Select a font size"
 msgstr "Select Sound File"
 
-#: kmcomposewin.cpp:1583
+#: kmcomposewin.cpp:1582
 msgid "Align Left"
 msgstr "Align Left"
 
-#: kmcomposewin.cpp:1587
+#: kmcomposewin.cpp:1586
 msgid "Align Right"
 msgstr "Align Right"
 
-#: kmcomposewin.cpp:1590
+#: kmcomposewin.cpp:1589
 msgid "Align Center"
 msgstr "Align Centre"
 
-#: kmcomposewin.cpp:1593
+#: kmcomposewin.cpp:1592
 msgid "&Bold"
 msgstr "&Bold"
 
-#: kmcomposewin.cpp:1596
+#: kmcomposewin.cpp:1595
 msgid "&Italic"
 msgstr "&Italic"
 
-#: kmcomposewin.cpp:1599
+#: kmcomposewin.cpp:1598
 msgid "&Underline"
 msgstr "&Underline"
 
-#: kmcomposewin.cpp:1602
+#: kmcomposewin.cpp:1601
 msgid "Reset Font Settings"
 msgstr "Reset Font Settings"
 
-#: kmcomposewin.cpp:1605
+#: kmcomposewin.cpp:1604
 msgid "Text Color..."
 msgstr "Text Colour..."
 
-#: kmcomposewin.cpp:1619
+#: kmcomposewin.cpp:1618
 #, fuzzy
 msgid "Configure KMail..."
 msgstr "&Configure KMail..."
 
-#: kmcomposewin.cpp:1628
+#: kmcomposewin.cpp:1627
 #, fuzzy
 msgid " Spellcheck: %1 "
 msgstr "Spellchecker"
 
-#: kmcomposewin.cpp:1629 kmcomposewin.cpp:1643
+#: kmcomposewin.cpp:1628 kmcomposewin.cpp:1642
 msgid " Column: %1 "
 msgstr " Column: %1 "
 
-#: kmcomposewin.cpp:1630 kmcomposewin.cpp:1641
+#: kmcomposewin.cpp:1629 kmcomposewin.cpp:1640
 msgid " Line: %1 "
 msgstr " Line: %1 "
 
-#: kmcomposewin.cpp:2252
+#: kmcomposewin.cpp:2251
 #, fuzzy
 msgid "Re&save as Template"
 msgstr "&Replace"
 
-#: kmcomposewin.cpp:2253
+#: kmcomposewin.cpp:2252
 msgid "&Save as Draft"
 msgstr "&Save as Draft"
 
-#: kmcomposewin.cpp:2255
+#: kmcomposewin.cpp:2254
 #, fuzzy
 msgid ""
 "Resave this message in the Templates folder. It can then be used at a later "
@@ -6157,7 +6157,7 @@ msgstr ""
 "Save this message in the Drafts folder. It can then be edited and sent at a "
 "later time."
 
-#: kmcomposewin.cpp:2257
+#: kmcomposewin.cpp:2256
 msgid ""
 "Save this message in the Drafts folder. It can then be edited and sent at a "
 "later time."
@@ -6165,15 +6165,15 @@ msgstr ""
 "Save this message in the Drafts folder. It can then be edited and sent at a "
 "later time."
 
-#: kmcomposewin.cpp:2261
+#: kmcomposewin.cpp:2260
 msgid "Do you want to save the message for later or discard it?"
 msgstr "Do you want to save the message for later or discard it?"
 
-#: kmcomposewin.cpp:2262
+#: kmcomposewin.cpp:2261
 msgid "Close Composer"
 msgstr "Close Composer"
 
-#: kmcomposewin.cpp:2333
+#: kmcomposewin.cpp:2332
 msgid ""
 "The message you have composed seems to refer to an attached file but you "
 "have not attached anything.\n"
@@ -6183,15 +6183,15 @@ msgstr ""
 "have not attached anything.\n"
 "Do you want to attach a file to your message?"
 
-#: kmcomposewin.cpp:2336
+#: kmcomposewin.cpp:2335
 msgid "File Attachment Reminder"
 msgstr "File Attachment Reminder"
 
-#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4480
+#: kmcomposewin.cpp:2337 kmcomposewin.cpp:4479
 msgid "&Send as Is"
 msgstr "&Send as Is"
 
-#: kmcomposewin.cpp:2415
+#: kmcomposewin.cpp:2414
 msgid ""
 "<qt><p>KMail could not recognize the location of the attachment (%1);</"
 "p><p>you have to specify the full path if you wish to attach a file.</p></qt>"
@@ -6199,26 +6199,26 @@ msgstr ""
 "<qt><p>KMail could not recognise the location of the attachment (%1);</"
 "p><p>you have to specify the full path if you wish to attach a file.</p></qt>"
 
-#: kmcomposewin.cpp:2424
+#: kmcomposewin.cpp:2423
 msgid ""
 "<qt><p>Your administrator has disallowed attaching files bigger than %1 MB.</"
 "p>"
 msgstr ""
 
-#: kmcomposewin.cpp:2777
+#: kmcomposewin.cpp:2776
 msgid "Attach File"
 msgstr "Attach File"
 
-#: kmcomposerui.rc:68 kmcomposewin.cpp:2778
+#: kmcomposerui.rc:68 kmcomposewin.cpp:2777
 #, no-c-format
 msgid "&Attach"
 msgstr "&Attach"
 
-#: kmcomposewin.cpp:2959
+#: kmcomposewin.cpp:2958
 msgid "Insert File"
 msgstr "Insert File"
 
-#: kmcomposewin.cpp:3129
+#: kmcomposewin.cpp:3128
 msgid ""
 "<qt><p>An error occurred while trying to export the key from the backend:</"
 "p><p><b>%1</b></p></qt>"
@@ -6226,57 +6226,57 @@ msgstr ""
 "<qt><p>An error occurred while trying to export the key from the backend:</"
 "p><p><b>%1</b></p></qt>"
 
-#: kmcomposewin.cpp:3133
+#: kmcomposewin.cpp:3132
 msgid "Key Export Failed"
 msgstr "Key Export Failed"
 
-#: kmcomposewin.cpp:3160
+#: kmcomposewin.cpp:3159
 msgid "Exporting key..."
 msgstr "Exporting key..."
 
-#: kmcomposewin.cpp:3171
+#: kmcomposewin.cpp:3170
 #, c-format
 msgid "OpenPGP key 0x%1"
 msgstr "OpenPGP key 0x%1"
 
-#: kmcomposewin.cpp:3186
+#: kmcomposewin.cpp:3185
 msgid "Attach Public OpenPGP Key"
 msgstr "Attach Public OpenPGP Key"
 
-#: kmcomposewin.cpp:3187
+#: kmcomposewin.cpp:3186
 msgid "Select the public key which should be attached."
 msgstr "Select the public key which should be attached."
 
-#: kmcomposewin.cpp:3209 kmmimeparttree.cpp:135 kmreaderwin.cpp:2035
+#: kmcomposewin.cpp:3208 kmmimeparttree.cpp:135 kmreaderwin.cpp:2034
 msgid ""
 "_: to open\n"
 "Open"
 msgstr "Open"
 
-#: kmcomposewin.cpp:3211 kmmimeparttree.cpp:136 kmreaderwin.cpp:2036
+#: kmcomposewin.cpp:3210 kmmimeparttree.cpp:136 kmreaderwin.cpp:2035
 msgid "Open With..."
 msgstr "Open With..."
 
-#: kmcomposewin.cpp:3213
+#: kmcomposewin.cpp:3212
 msgid ""
 "_: to view\n"
 "View"
 msgstr "View"
 
-#: kmcomposewin.cpp:3216
+#: kmcomposewin.cpp:3215
 #, fuzzy
 msgid "Edit With..."
 msgstr "Edit Script..."
 
-#: kmcomposewin.cpp:3224
+#: kmcomposewin.cpp:3223
 msgid "Add Attachment..."
 msgstr "Add Attachment..."
 
-#: kmcomposewin.cpp:3311 kmcomposewin.cpp:3319
+#: kmcomposewin.cpp:3310 kmcomposewin.cpp:3318
 msgid "KMail could not compress the file."
 msgstr "KMail could not compress the file."
 
-#: kmcomposewin.cpp:3325
+#: kmcomposewin.cpp:3324
 msgid ""
 "The compressed file is larger than the original. Do you want to keep the "
 "original one?"
@@ -6284,43 +6284,43 @@ msgstr ""
 "The compressed file is larger than the original. Do you want to keep the "
 "original one?"
 
-#: kmcomposewin.cpp:3326
+#: kmcomposewin.cpp:3325
 msgid "Keep"
 msgstr "Keep"
 
-#: kmcomposewin.cpp:3392 kmcomposewin.cpp:3400
+#: kmcomposewin.cpp:3391 kmcomposewin.cpp:3399
 msgid "KMail could not uncompress the file."
 msgstr "KMail could not uncompress the file."
 
-#: kmcomposewin.cpp:3600
+#: kmcomposewin.cpp:3599
 msgid "Save Attachment As"
 msgstr "Save Attachment As"
 
-#: kmcomposewin.cpp:3855 kmedit.cpp:178
+#: kmcomposewin.cpp:3854 kmedit.cpp:177
 msgid "Add as Text"
 msgstr "Add as Text"
 
-#: kmcomposewin.cpp:3856 kmedit.cpp:179
+#: kmcomposewin.cpp:3855 kmedit.cpp:178
 msgid "Add as Attachment"
 msgstr "Add as Attachment"
 
-#: kmcomposewin.cpp:3857
+#: kmcomposewin.cpp:3856
 msgid ""
 "Please select whether you want to insert the content as text into the "
 "editor, or append the referenced file as an attachment."
 msgstr ""
 
-#: kmcomposewin.cpp:3859
+#: kmcomposewin.cpp:3858
 #, fuzzy
 msgid "Paste as text or attachment?"
 msgstr "Paste as Attac&hment"
 
-#: kmcomposewin.cpp:3934 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
-#: kmfolderdia.cpp:710 kmfoldertree.cpp:1641 managesievescriptsdialog.cpp:302
+#: kmcomposewin.cpp:3933 kmfilterdlg.cpp:716 kmfolderdia.cpp:330
+#: kmfolderdia.cpp:709 kmfoldertree.cpp:1641 managesievescriptsdialog.cpp:302
 msgid "unnamed"
 msgstr "unnamed"
 
-#: kmcomposewin.cpp:3960
+#: kmcomposewin.cpp:3959
 msgid ""
 "<qt><p>You have requested that messages be encrypted to yourself, but the "
 "currently selected identity does not define an (OpenPGP or S/MIME) "
@@ -6332,11 +6332,11 @@ msgstr ""
 "encryption key to use for this.</p><p>Please select the key(s) to use in the "
 "identity configuration.</p></qt>"
 
-#: kmcomposewin.cpp:3967
+#: kmcomposewin.cpp:3966
 msgid "Undefined Encryption Key"
 msgstr "Undefined Encryption Key"
 
-#: kmcomposewin.cpp:4014
+#: kmcomposewin.cpp:4013
 msgid ""
 "<qt><p>In order to be able to sign this message you first have to define the "
 "(OpenPGP or S/MIME) signing key to use.</p><p>Please select the key to use "
@@ -6346,11 +6346,11 @@ msgstr ""
 "(OpenPGP or S/MIME) signing key to use.</p><p>Please select the key to use "
 "in the identity configuration.</p></qt>"
 
-#: kmcomposewin.cpp:4021
+#: kmcomposewin.cpp:4020
 msgid "Undefined Signing Key"
 msgstr "Undefined Signing Key"
 
-#: kmcomposewin.cpp:4128
+#: kmcomposewin.cpp:4127
 msgid ""
 "KMail is currently in offline mode,your messages will be kept in the outbox "
 "until you go online."
@@ -6358,11 +6358,11 @@ msgstr ""
 "KMail is currently in offline mode,your messages will be kept in the outbox "
 "until you go online."
 
-#: kmcomposewin.cpp:4130 kmkernel.cpp:1300
+#: kmcomposewin.cpp:4129 kmkernel.cpp:1299
 msgid "Online/Offline"
 msgstr "Online/Offline"
 
-#: kmcomposewin.cpp:4145
+#: kmcomposewin.cpp:4144
 msgid ""
 "You must enter your email address in the From: field. You should also set "
 "your email address for all identities, so that you do not have to enter it "
@@ -6372,7 +6372,7 @@ msgstr ""
 "your email address for all identities, so that you do not have to enter it "
 "for each message."
 
-#: kmcomposewin.cpp:4156
+#: kmcomposewin.cpp:4155
 msgid ""
 "You must specify at least one receiver,either in the To: field or as CC or "
 "as BCC."
@@ -6380,57 +6380,57 @@ msgstr ""
 "You must specify at least one receiver,either in the To: field or as CC or "
 "as BCC."
 
-#: kmcomposewin.cpp:4164
+#: kmcomposewin.cpp:4163
 #, fuzzy
 msgid "To field is missing.Send message anyway?"
 msgstr "You did not specify a subject. Send message anyway?"
 
-#: kmcomposewin.cpp:4166
+#: kmcomposewin.cpp:4165
 #, fuzzy
 msgid "No To: specified"
 msgstr "No Name Specified"
 
-#: kmcomposewin.cpp:4191
+#: kmcomposewin.cpp:4190
 msgid "You did not specify a subject. Send message anyway?"
 msgstr "You did not specify a subject. Send message anyway?"
 
-#: kmcomposewin.cpp:4193
+#: kmcomposewin.cpp:4192
 msgid "No Subject Specified"
 msgstr "No Subject Specified"
 
-#: kmcomposewin.cpp:4194
+#: kmcomposewin.cpp:4193
 msgid "S&end as Is"
 msgstr "S&end as Is"
 
-#: kmcomposewin.cpp:4195
+#: kmcomposewin.cpp:4194
 msgid "&Specify the Subject"
 msgstr "&Specify the Subject"
 
-#: kmcomposewin.cpp:4233
+#: kmcomposewin.cpp:4232
 msgid "&Keep markup, do not sign/encrypt"
 msgstr "&Keep markup, do not sign/encrypt"
 
-#: kmcomposewin.cpp:4234
+#: kmcomposewin.cpp:4233
 msgid "&Keep markup, do not encrypt"
 msgstr "&Keep markup, do not encrypt"
 
-#: kmcomposewin.cpp:4235
+#: kmcomposewin.cpp:4234
 msgid "&Keep markup, do not sign"
 msgstr "&Keep markup, do not sign"
 
-#: kmcomposewin.cpp:4237
+#: kmcomposewin.cpp:4236
 msgid "Sign/Encrypt (delete markup)"
 msgstr "Sign/Encrypt (delete markup)"
 
-#: kmcomposewin.cpp:4238
+#: kmcomposewin.cpp:4237
 msgid "Encrypt (delete markup)"
 msgstr "Encrypt (delete markup)"
 
-#: kmcomposewin.cpp:4239
+#: kmcomposewin.cpp:4238
 msgid "Sign (delete markup)"
 msgstr "Sign (delete markup)"
 
-#: kmcomposewin.cpp:4241
+#: kmcomposewin.cpp:4240
 msgid ""
 "<qt><p>Inline signing/encrypting of HTML messages is not possible;</p><p>do "
 "you want to delete your markup?</p></qt>"
@@ -6438,11 +6438,11 @@ msgstr ""
 "<qt><p>Inline signing/encrypting of HTML messages is not possible;</p><p>do "
 "you want to delete your markup?</p></qt>"
 
-#: kmcomposewin.cpp:4243
+#: kmcomposewin.cpp:4242
 msgid "Sign/Encrypt Message?"
 msgstr "Sign/Encrypt Message?"
 
-#: kmcomposewin.cpp:4292
+#: kmcomposewin.cpp:4291
 #, fuzzy
 msgid ""
 "The custom drafts or templates folder for identify \"%1\" does not exist "
@@ -6451,65 +6451,65 @@ msgstr ""
 "The custom drafts folder for identity \"%1\" does not exist (anymore); "
 "therefore, the default drafts folder will be used."
 
-#: kmcomposewin.cpp:4392 kmsender.cpp:114
+#: kmcomposewin.cpp:4391 kmsender.cpp:114
 msgid "Please create an account for sending and try again."
 msgstr "Please create an account for sending and try again."
 
-#: kmcomposewin.cpp:4455
+#: kmcomposewin.cpp:4454
 msgid "About to send email..."
 msgstr "About to send email..."
 
-#: kmcomposewin.cpp:4456
+#: kmcomposewin.cpp:4455
 msgid "Send Confirmation"
 msgstr "Send Confirmation"
 
-#: kmcomposewin.cpp:4457 redirectdialog.cpp:83
+#: kmcomposewin.cpp:4456 redirectdialog.cpp:83
 msgid "&Send Now"
 msgstr "&Send Now"
 
-#: kmcomposewin.cpp:4478
+#: kmcomposewin.cpp:4477
 msgid ""
 "You are trying to send the mail to more than %1 recipients. Send message "
 "anyway?"
 msgstr ""
 
-#: kmcomposewin.cpp:4479
+#: kmcomposewin.cpp:4478
 #, fuzzy
 msgid "Too many receipients"
 msgstr "No recipients"
 
-#: kmcomposewin.cpp:4481
+#: kmcomposewin.cpp:4480
 #, fuzzy
 msgid "&Edit Recipients"
 msgstr "Additional Recipients"
 
-#: kmcomposewin.cpp:4727
+#: kmcomposewin.cpp:4726
 #, fuzzy
 msgid "Spellcheck: on"
 msgstr "Spellchecker"
 
-#: kmcomposewin.cpp:4729
+#: kmcomposewin.cpp:4728
 #, fuzzy
 msgid "Spellcheck: off"
 msgstr "Spellchecker"
 
-#: kmcomposewin.cpp:4786
+#: kmcomposewin.cpp:4785
 msgid " Spell check canceled."
 msgstr " Spell check cancelled."
 
-#: kmcomposewin.cpp:4789
+#: kmcomposewin.cpp:4788
 msgid " Spell check stopped."
 msgstr " Spell check stopped."
 
-#: kmcomposewin.cpp:4792
+#: kmcomposewin.cpp:4791
 msgid " Spell check complete."
 msgstr " Spell check complete."
 
-#: kmcomposewin.cpp:4991 kmcomposewin.cpp:4999
+#: kmcomposewin.cpp:4990 kmcomposewin.cpp:4998
 msgid "Spellchecker"
 msgstr "Spellchecker"
 
-#: kmcomposewin.cpp:5303
+#: kmcomposewin.cpp:5302
 msgid ""
 "Please configure a Crypto Backend to use for Chiasmus encryption first.\n"
 "You can do this in the Crypto Backends tab of the configure dialog's "
@@ -6519,7 +6519,7 @@ msgstr ""
 "You can do this in the Crypto Backends tab of the configure dialogue's "
 "Security page."
 
-#: kmcomposewin.cpp:5307
+#: kmcomposewin.cpp:5306
 msgid ""
 "It looks as though libkleopatra was compiled without Chiasmus support. You "
 "might want to recompile libkleopatra with --enable-chiasmus."
@@ -6527,62 +6527,62 @@ msgstr ""
 "It looks as though libkleopatra was compiled without Chiasmus support. You "
 "might want to recompile libkleopatra with --enable-chiasmus."
 
-#: kmcomposewin.cpp:5310
+#: kmcomposewin.cpp:5309
 msgid "No Chiasmus Backend Configured"
 msgstr "No Chiasmus Backend Configured"
 
-#: kmcomposewin.cpp:5341
+#: kmcomposewin.cpp:5340
 msgid "No Chiasmus Keys Found"
 msgstr "No Chiasmus Keys Found"
 
-#: kmcomposewin.cpp:5345
+#: kmcomposewin.cpp:5344
 msgid "Chiasmus Encryption Key Selection"
 msgstr "Chiasmus Encryption Key Selection"
 
-#: kmcomposewin.cpp:5377
+#: kmcomposewin.cpp:5376
 #, fuzzy
 msgid "Message will be signed"
 msgstr "Message was signed by %1."
 
-#: kmcomposewin.cpp:5377
+#: kmcomposewin.cpp:5376
 #, fuzzy
 msgid "Message will not be signed"
 msgstr "Message was signed by %1."
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 #, fuzzy
 msgid "Message will be encrypted"
 msgstr "OpenPGP Message - Encrypted"
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 #, fuzzy
 msgid "Message will not be encrypted"
 msgstr "Message with subject: "
 
-#: kmedit.cpp:458
+#: kmedit.cpp:457
 msgid "Unable to start external editor."
 msgstr "Unable to start external editor."
 
-#: kmedit.cpp:522
+#: kmedit.cpp:521
 #, fuzzy
 msgid "No Suggestions"
 msgstr "Suggestions"
 
-#: kmedit.cpp:529
+#: kmedit.cpp:528
 #, fuzzy
 msgid "Add to Dictionary"
 msgstr "&Dictionary"
 
-#: kmedit.cpp:530
+#: kmedit.cpp:529
 #, fuzzy
 msgid "Ignore All"
 msgstr "&Ignore"
 
-#: kmedit.cpp:587
+#: kmedit.cpp:586
 msgid "Automatic spellchecking is not possible on text with markup."
 msgstr "Automatic spellchecking is not possible on text with markup."
 
-#: kmedit.cpp:631
+#: kmedit.cpp:630
 msgid ""
 "The external editor is still running.\n"
 "Abort the external editor or leave it open?"
@@ -6590,19 +6590,19 @@ msgstr ""
 "The external editor is still running.\n"
 "Abort the external editor or leave it open?"
 
-#: kmedit.cpp:634
+#: kmedit.cpp:633
 msgid "Abort Editor"
 msgstr "Abort Editor"
 
-#: kmedit.cpp:634
+#: kmedit.cpp:633
 msgid "Leave Editor Open"
 msgstr "Leave Editor Open"
 
-#: kmedit.cpp:661
+#: kmedit.cpp:660
 msgid "Spellcheck - KMail"
 msgstr "Spellcheck - KMail"
 
-#: kmedit.cpp:884
+#: kmedit.cpp:883
 msgid ""
 "ISpell/Aspell could not be started. Please make sure you have ISpell or "
 "Aspell properly configured and in your PATH."
@@ -6610,11 +6610,11 @@ msgstr ""
 "ISpell/Aspell could not be started. Please make sure you have ISpell or "
 "Aspell properly configured and in your PATH."
 
-#: kmedit.cpp:893
+#: kmedit.cpp:892
 msgid "ISpell/Aspell seems to have crashed."
 msgstr "ISpell/Aspell seems to have crashed."
 
-#: kmedit.cpp:902
+#: kmedit.cpp:901
 msgid "No misspellings encountered."
 msgstr "No misspellings encountered."
 
@@ -6862,7 +6862,7 @@ msgstr "Pipe Through"
 msgid "Play Sound"
 msgstr "Play Sound"
 
-#: kmfilterdlg.cpp:55
+#: kmfilterdlg.cpp:54
 msgid ""
 "<qt><p>This is the list of defined filters. They are processed top-to-bottom."
 "</p><p>Click on any filter to edit it using the controls in the right-hand "
@@ -6872,7 +6872,7 @@ msgstr ""
 "</p><p>Click on any filter to edit it using the controls in the right-hand "
 "half of the dialogue.</p></qt>"
 
-#: kmfilterdlg.cpp:61
+#: kmfilterdlg.cpp:60
 msgid ""
 "<qt><p>Click this button to create a new filter.</p><p>The filter will be "
 "inserted just before the currently-selected one, but you can always change "
@@ -6884,7 +6884,7 @@ msgstr ""
 "that later on.</p><p>If you have clicked this button accidentally, you can "
 "undo this by clicking on the <em>Delete</em> button.</p></qt>"
 
-#: kmfilterdlg.cpp:68
+#: kmfilterdlg.cpp:67
 msgid ""
 "<qt><p>Click this button to copy a filter.</p><p>If you have clicked this "
 "button accidentally, you can undo this by clicking on the <em>Delete</em> "
@@ -6894,7 +6894,7 @@ msgstr ""
 "button accidentally, you can undo this by clicking on the <em>Delete</em> "
 "button.</p></qt>"
 
-#: kmfilterdlg.cpp:72
+#: kmfilterdlg.cpp:71
 msgid ""
 "<qt><p>Click this button to <em>delete</em> the currently-selected filter "
 "from the list above.</p><p>There is no way to get the filter back once it is "
@@ -6906,7 +6906,7 @@ msgstr ""
 "deleted, but you can always leave the dialogue by clicking <em>Cancel</em> "
 "to discard the changes made.</p></qt>"
 
-#: kmfilterdlg.cpp:79
+#: kmfilterdlg.cpp:78
 #, fuzzy
 msgid ""
 "<qt><p>Click this button to move the currently-selected filter to the "
@@ -6921,7 +6921,7 @@ msgstr ""
 "accidentally, you can undo this by clicking on the <em>Up</em> button.</p></"
 "qt>"
 
-#: kmfilterdlg.cpp:85
+#: kmfilterdlg.cpp:84
 msgid ""
 "<qt><p>Click this button to move the currently-selected filter <em>up</em> "
 "one in the list above.</p><p>This is useful since the order of the filters "
@@ -6937,7 +6937,7 @@ msgstr ""
 "accidentally, you can undo this by clicking on the <em>Down</em> button.</"
 "p></qt>"
 
-#: kmfilterdlg.cpp:93
+#: kmfilterdlg.cpp:92
 msgid ""
 "<qt><p>Click this button to move the currently-selected filter <em>down</em> "
 "one in the list above.</p><p>This is useful since the order of the filters "
@@ -6953,7 +6953,7 @@ msgstr ""
 "accidentally, you can undo this by clicking on the <em>Up</em> button.</p></"
 "qt>"
 
-#: kmfilterdlg.cpp:101
+#: kmfilterdlg.cpp:100
 #, fuzzy
 msgid ""
 "<qt><p>Click this button to move the currently-selected filter to the "
@@ -6968,7 +6968,7 @@ msgstr ""
 "accidentally, you can undo this by clicking on the <em>Up</em> button.</p></"
 "qt>"
 
-#: kmfilterdlg.cpp:107
+#: kmfilterdlg.cpp:106
 msgid ""
 "<qt><p>Click this button to rename the currently-selected filter.</"
 "p><p>Filters are named automatically, as long as they start with \"&lt;\".</"
@@ -6982,7 +6982,7 @@ msgstr ""
 "back, click this button and select <em>Clear</em> followed by <em>OK</em> in "
 "the appearing dialogue.</p></qt>"
 
-#: kmfilterdlg.cpp:114
+#: kmfilterdlg.cpp:113
 msgid ""
 "<qt><p>Check this button to force the confirmation dialog to be displayed.</"
 "p><p>This is useful if you have defined a ruleset that tags messages to be "
@@ -6998,118 +6998,118 @@ msgstr ""
 "on the server, or if you wanted to change the ruleset to tag the messages "
 "differently.</p></qt>"
 
-#: kmfilterdlg.cpp:133
+#: kmfilterdlg.cpp:132
 msgid "POP3 Filter Rules"
 msgstr "POP3 Filter Rules"
 
-#: kmfilterdlg.cpp:133
+#: kmfilterdlg.cpp:132
 msgid "Filter Rules"
 msgstr "Filter Rules"
 
-#: kmfilterdlg.cpp:155
+#: kmfilterdlg.cpp:154
 msgid "Available Filters"
 msgstr "Available Filters"
 
-#: kmfilterdlg.cpp:168
+#: kmfilterdlg.cpp:167
 msgid "A&dvanced"
 msgstr "A&dvanced"
 
-#: kmfilterdlg.cpp:175
+#: kmfilterdlg.cpp:174
 msgid "Filter Criteria"
 msgstr "Filter Criteria"
 
-#: kmfilterdlg.cpp:179
+#: kmfilterdlg.cpp:178
 msgid "Filter Action"
 msgstr "Filter Action"
 
-#: kmfilterdlg.cpp:182
+#: kmfilterdlg.cpp:181
 msgid "Global Options"
 msgstr "Global Options"
 
-#: kmfilterdlg.cpp:183
+#: kmfilterdlg.cpp:182
 msgid "Always &show matched 'Download Later' messages in confirmation dialog"
 msgstr ""
 "Always &show matched 'Download Later' messages in confirmation dialogue"
 
-#: kmfilterdlg.cpp:188
+#: kmfilterdlg.cpp:187
 msgid "Filter Actions"
 msgstr "Filter Actions"
 
-#: kmfilterdlg.cpp:193
+#: kmfilterdlg.cpp:192
 msgid "Advanced Options"
 msgstr "Advanced Options"
 
-#: kmfilterdlg.cpp:201
+#: kmfilterdlg.cpp:200
 msgid "Apply this filter to incoming messages:"
 msgstr "Apply this filter to incoming messages:"
 
-#: kmfilterdlg.cpp:205
+#: kmfilterdlg.cpp:204
 msgid "from all accounts"
 msgstr "from all accounts"
 
-#: kmfilterdlg.cpp:208
+#: kmfilterdlg.cpp:207
 msgid "from all but online IMAP accounts"
 msgstr "from all but online IMAP accounts"
 
-#: kmfilterdlg.cpp:211
+#: kmfilterdlg.cpp:210
 msgid "from checked accounts only"
 msgstr "from checked accounts only"
 
-#: kmfilterdlg.cpp:217
+#: kmfilterdlg.cpp:216
 msgid "Account Name"
 msgstr "Account Name"
 
-#: kmfilterdlg.cpp:224
+#: kmfilterdlg.cpp:223
 msgid "Apply this filter to &sent messages"
 msgstr "Apply this filter to &sent messages"
 
-#: kmfilterdlg.cpp:227
+#: kmfilterdlg.cpp:226
 msgid "Apply this filter on manual &filtering"
 msgstr "Apply this filter on manual &filtering"
 
-#: kmfilterdlg.cpp:230
+#: kmfilterdlg.cpp:229
 msgid "If this filter &matches, stop processing here"
 msgstr "If this filter &matches, stop processing here"
 
-#: kmfilterdlg.cpp:234
+#: kmfilterdlg.cpp:233
 msgid "Add this filter to the Apply Filter menu"
 msgstr "Add this filter to the Apply Filter menu"
 
-#: kmfilterdlg.cpp:236
+#: kmfilterdlg.cpp:235
 msgid "Shortcut:"
 msgstr "Shortcut:"
 
-#: kmfilterdlg.cpp:242
+#: kmfilterdlg.cpp:241
 msgid "Additionally add this filter to the toolbar"
 msgstr "Additionally add this filter to the toolbar"
 
-#: kmfilterdlg.cpp:247
+#: kmfilterdlg.cpp:246
 msgid "Icon for this filter:"
 msgstr "Icon for this filter:"
 
-#: kmfilterdlg.cpp:612
+#: kmfilterdlg.cpp:611
 msgid "Up"
 msgstr "Up"
 
-#: kmfilterdlg.cpp:613
+#: kmfilterdlg.cpp:612
 msgid "Down"
 msgstr "Down"
 
-#: kmfilterdlg.cpp:632
+#: kmfilterdlg.cpp:631
 msgid "Rename..."
 msgstr "Rename..."
 
-#: kmail_part.rc:10 kmfilterdlg.cpp:633 kmmainwin.rc:10 kmsearchpattern.h:219
+#: kmail_part.rc:10 kmfilterdlg.cpp:632 kmmainwin.rc:10 kmsearchpattern.h:218
 #, no-c-format
 msgid "New"
 msgstr "New"
 
-#: kmfilterdlg.cpp:645
+#: kmfilterdlg.cpp:644
 #, fuzzy
 msgid "Select Source Folders"
 msgstr "Select Shortcut for Folder"
 
-#: kmfilterdlg.cpp:756
+#: kmfilterdlg.cpp:755
 msgid ""
 "At least one filter targets a folder on an online IMAP account. Such filters "
 "will only be applied when manually filtering and when filtering incoming "
@@ -7119,7 +7119,7 @@ msgstr ""
 "will only be applied when manually filtering and when filtering incoming "
 "online IMAP mail."
 
-#: kmfilterdlg.cpp:786
+#: kmfilterdlg.cpp:785
 msgid ""
 "The following filters have not been saved because they were invalid (e.g. "
 "containing no actions or no search rules)."
@@ -7127,11 +7127,11 @@ msgstr ""
 "The following filters have not been saved because they were invalid (e.g. "
 "containing no actions or no search rules)."
 
-#: kmfilterdlg.cpp:947
+#: kmfilterdlg.cpp:946
 msgid "Rename Filter"
 msgstr "Rename Filter"
 
-#: kmfilterdlg.cpp:948
+#: kmfilterdlg.cpp:947
 msgid ""
 "Rename filter \"%1\" to:\n"
 "(leave the field empty for automatic naming)"
@@ -7139,24 +7139,24 @@ msgstr ""
 "Rename filter \"%1\" to:\n"
 "(leave the field empty for automatic naming)"
 
-#: kmfilterdlg.cpp:973
+#: kmfilterdlg.cpp:972
 #, fuzzy
 msgid "Select Folders to Filter"
 msgstr "Select Folder with Focus"
 
-#: kmfilterdlg.cpp:1136
+#: kmfilterdlg.cpp:1135
 msgid "Please select an action."
 msgstr "Please select an action."
 
-#: kmfilterdlg.cpp:1303
+#: kmfilterdlg.cpp:1302
 msgid "&Download mail"
 msgstr "&Download mail"
 
-#: kmfilterdlg.cpp:1304
+#: kmfilterdlg.cpp:1303
 msgid "Download mail la&ter"
 msgstr "Download mail la&ter"
 
-#: kmfilterdlg.cpp:1305
+#: kmfilterdlg.cpp:1304
 msgid "D&elete mail from server"
 msgstr "D&elete mail from server"
 
@@ -7280,11 +7280,11 @@ msgstr ""
 "subfolders?\n"
 "This will remove all changes you have done locally to your folders."
 
-#: kmfoldercachedimap.cpp:743 kmmainwidget.cpp:1316
+#: kmfoldercachedimap.cpp:743 kmmainwidget.cpp:1315
 msgid "Refresh IMAP Cache"
 msgstr "Refresh IMAP Cache"
 
-#: kmfoldercachedimap.cpp:744 kmmainwidget.cpp:1316
+#: kmfoldercachedimap.cpp:744 kmmainwidget.cpp:1315
 msgid "&Refresh"
 msgstr "&Refresh"
 
@@ -7520,7 +7520,7 @@ msgstr ""
 "of new messages to you, or move them out of this folder.</p> <p>Do you want "
 "to move these messages to another folder now?</p>"
 
-#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1918
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1917
 msgid "Do Not Move"
 msgstr "Do Not Move"
 
@@ -7528,53 +7528,53 @@ msgstr "Do Not Move"
 msgid "Move Messages to Folder"
 msgstr "Move Messages to Folder"
 
-#: kmfolderdia.cpp:84
+#: kmfolderdia.cpp:83
 msgid "Permissions (ACL)"
 msgstr "Permissions (ACL)"
 
-#: folderpropertiesdialog.ui:30 kmfolderdia.cpp:122 snippetwidget.cpp:119
+#: folderpropertiesdialog.ui:30 kmfolderdia.cpp:121 snippetwidget.cpp:119
 #, no-c-format
 msgid "General"
 msgstr "General"
 
-#: kmfolderdia.cpp:125
+#: kmfolderdia.cpp:124
 msgid "Templates"
 msgstr ""
 
-#: kmfolderdia.cpp:134
+#: kmfolderdia.cpp:133
 msgid "Access Control"
 msgstr "Access Control"
 
-#: kmfolderdia.cpp:141
+#: kmfolderdia.cpp:140
 #, fuzzy
 msgid "Quota"
 msgstr "Total"
 
-#: kmfolderdia.cpp:327
+#: kmfolderdia.cpp:326
 msgid ""
 "Not enough permissions to rename this folder.\n"
 "The parent folder doesn't have write support.\n"
 "A sync is needed after changing the permissions."
 msgstr ""
 
-#: folderpropertiesdialog.ui:243 kmfolderdia.cpp:356
+#: folderpropertiesdialog.ui:243 kmfolderdia.cpp:355
 #, no-c-format
 msgid "Use custom &icons"
 msgstr "Use custom &icons"
 
-#: kmfolderdia.cpp:361
+#: kmfolderdia.cpp:360
 msgid "&Normal:"
 msgstr "&Normal:"
 
-#: kmfolderdia.cpp:376
+#: kmfolderdia.cpp:375
 msgid "&Unread:"
 msgstr "&Unread:"
 
-#: kmfolderdia.cpp:413
+#: kmfolderdia.cpp:412
 msgid "Act on new/unread mail in this folder"
 msgstr "Act on new/unread mail in this folder"
 
-#: kmfolderdia.cpp:415
+#: kmfolderdia.cpp:414
 msgid ""
 "<qt><p>If this option is enabled then you will be notified about new/unread "
 "mail in this folder. Moreover, going to the next/previous folder with unread "
@@ -7592,15 +7592,15 @@ msgstr ""
 "messages. This is useful for ignoring any new/unread mail in your trash and "
 "spam folder.</p></qt>"
 
-#: kmfolderdia.cpp:431
+#: kmfolderdia.cpp:430
 msgid "Include this folder in mail checks"
 msgstr "Include this folder in mail checks"
 
-#: kmfolderdia.cpp:442
+#: kmfolderdia.cpp:441
 msgid "Keep replies in this folder"
 msgstr "Keep replies in this folder"
 
-#: kmfolderdia.cpp:444
+#: kmfolderdia.cpp:443
 msgid ""
 "Check this option if you want replies you write to mails in this folder to "
 "be put in this same folder after sending, instead of in the configured sent-"
@@ -7610,33 +7610,33 @@ msgstr ""
 "put in this same folder after sending, instead of in the configured sent-"
 "mail folder."
 
-#: kmfolderdia.cpp:459
+#: kmfolderdia.cpp:458
 msgid "Show Sender/Receiver Column in List of Messages"
 msgstr "Show Sender/Receiver Column in List of Messages"
 
-#: kmfolderdia.cpp:461
+#: kmfolderdia.cpp:460
 msgid "Sho&w column:"
 msgstr "Sho&w column:"
 
-#: folderpropertiesdialog.ui:520 kmfolderdia.cpp:468 kmheaders.cpp:185
-#: kmheaders.cpp:248 kmheaders.cpp:392 kmheaders.cpp:577 kmheaders.cpp:794
+#: folderpropertiesdialog.ui:520 kmfolderdia.cpp:467 kmheaders.cpp:184
+#: kmheaders.cpp:247 kmheaders.cpp:391 kmheaders.cpp:576 kmheaders.cpp:793
 #: kmpopfiltercnfrmdlg.cpp:40
 #, no-c-format
 msgid "Sender"
 msgstr "Sender"
 
-#: folderpropertiesdialog.ui:525 kmfolderdia.cpp:469 kmheaders.cpp:142
-#: kmheaders.cpp:188 kmheaders.cpp:245 kmheaders.cpp:250 kmheaders.cpp:394
-#: kmheaders.cpp:579 kmheaders.cpp:796 kmpopfiltercnfrmdlg.cpp:41
+#: folderpropertiesdialog.ui:525 kmfolderdia.cpp:468 kmheaders.cpp:141
+#: kmheaders.cpp:187 kmheaders.cpp:244 kmheaders.cpp:249 kmheaders.cpp:393
+#: kmheaders.cpp:578 kmheaders.cpp:795 kmpopfiltercnfrmdlg.cpp:41
 #, no-c-format
 msgid "Receiver"
 msgstr "Receiver"
 
-#: kmfolderdia.cpp:480
+#: kmfolderdia.cpp:479
 msgid "&Sender identity:"
 msgstr "&Sender identity:"
 
-#: kmfolderdia.cpp:486
+#: kmfolderdia.cpp:485
 msgid ""
 "Select the sender identity to be used when writing new mail or replying to "
 "mail in this folder. This means that if you are in one of your work folders, "
@@ -7650,15 +7650,15 @@ msgstr ""
 "signing or encryption keys automatically. Identities can be set up in the "
 "main configuration dialogue. (Settings -> Configure KMail)"
 
-#: kmfolderdia.cpp:500
+#: kmfolderdia.cpp:499
 msgid "&Folder contents:"
 msgstr "&Folder contents:"
 
-#: kmfolderdia.cpp:533
+#: kmfolderdia.cpp:532
 msgid "Generate free/&busy and activate alarms for:"
 msgstr "Generate free/&busy and activate alarms for:"
 
-#: kmfolderdia.cpp:540
+#: kmfolderdia.cpp:539
 msgid ""
 "This setting defines which users sharing this folder should get \"busy\" "
 "periods in their freebusy lists and should see the alarms for the events or "
@@ -7686,40 +7686,40 @@ msgstr ""
 "A company-wide folder with optional events in it would use \"Nobody\" since "
 "it is not known who will go to those events."
 
-#: kmfolderdia.cpp:555
+#: kmfolderdia.cpp:554
 msgid "Nobody"
 msgstr "Nobody"
 
-#: kmfolderdia.cpp:556
+#: kmfolderdia.cpp:555
 msgid "Admins of This Folder"
 msgstr "Admins of This Folder"
 
-#: kmfolderdia.cpp:557
+#: kmfolderdia.cpp:556
 msgid "All Readers of This Folder"
 msgstr "All Readers of This Folder"
 
-#: kmfolderdia.cpp:560
+#: kmfolderdia.cpp:559
 msgid ""
 "This setting allows you to disable alarms for folders shared by others. "
 msgstr ""
 
-#: kmfolderdia.cpp:562
+#: kmfolderdia.cpp:561
 #, fuzzy
 msgid "Block alarms locally"
 msgstr "Generate free/&busy and activate alarms for:"
 
-#: kmfolderdia.cpp:576
+#: kmfolderdia.cpp:575
 msgid "Share unread state with all users"
 msgstr ""
 
-#: kmfolderdia.cpp:579
+#: kmfolderdia.cpp:578
 msgid ""
 "If enabled, the unread state of messages in this folder will be the same for "
 "all users having access to this folders. If disabled (the default), every "
 "user with access to this folder has her own unread state."
 msgstr ""
 
-#: kmfolderdia.cpp:661
+#: kmfolderdia.cpp:660
 msgid ""
 "You have configured this folder to contain groupware information and the "
 "general configuration option to hide groupware folders is set. That means "
@@ -7828,11 +7828,11 @@ msgstr ""
 "including status flags, may be lost. Do you wish to downgrade your index "
 "file?"
 
-#: kmfoldermaildir.cpp:89
+#: kmfoldermaildir.cpp:88
 msgid "Error opening %1; this folder is missing."
 msgstr "Error opening %1; this folder is missing."
 
-#: kmfoldermaildir.cpp:92
+#: kmfoldermaildir.cpp:91
 msgid ""
 "Error opening %1; either this is not a valid maildir folder, or you do not "
 "have sufficient access permissions."
@@ -7840,27 +7840,27 @@ msgstr ""
 "Error opening %1; either this is not a valid maildir folder, or you do not "
 "have sufficient access permissions."
 
-#: kmfoldermaildir.cpp:124
+#: kmfoldermaildir.cpp:123
 msgid "Folder `%1' changed; recreating index."
 msgstr "Folder `%1' changed; recreating index."
 
-#: kmfoldermaildir.cpp:253
+#: kmfoldermaildir.cpp:252
 msgid "Could not sync maildir folder."
 msgstr "Could not sync maildir folder."
 
-#: kmfoldermaildir.cpp:418
+#: kmfoldermaildir.cpp:417
 msgid "Message could not be added to the folder, possibly disk space is low."
 msgstr "Message could not be added to the folder, possibly disk space is low."
 
-#: kmfoldermaildir.cpp:514
+#: kmfoldermaildir.cpp:513
 msgid "KMFolderMaildir::addMsg: abnormally terminating to prevent data loss."
 msgstr "KMFolderMaildir::addMsg: abnormally terminating to prevent data loss."
 
-#: kmfoldermaildir.cpp:888 kmfoldermbox.cpp:799
+#: kmfoldermaildir.cpp:887 kmfoldermbox.cpp:799
 msgid "Writing index file"
 msgstr "Writing index file"
 
-#: kmfoldermaildir.cpp:896 kmfoldermbox.cpp:808
+#: kmfoldermaildir.cpp:895 kmfoldermbox.cpp:808
 msgid ""
 "Your outbox contains messages which were most-likely not created by KMail;\n"
 "please remove them from there if you do not want KMail to send them."
@@ -7931,11 +7931,11 @@ msgstr "Could not add message to folder (No space left on device?)"
 msgid "Are you sure you want to expire old messages?"
 msgstr "Are you sure you want to expire old messages?"
 
-#: kmfoldermgr.cpp:69 kmmainwidget.cpp:1330
+#: kmfoldermgr.cpp:69 kmmainwidget.cpp:1329
 msgid "Expire Old Messages?"
 msgstr "Expire Old Messages?"
 
-#: kmfoldermgr.cpp:69 kmmainwidget.cpp:1330
+#: kmfoldermgr.cpp:69 kmmainwidget.cpp:1329
 msgid "Expire"
 msgstr "Expire"
 
@@ -7947,7 +7947,7 @@ msgstr ""
 "'%1' does not appear to be a folder.\n"
 "Please move the file out of the way."
 
-#: kmfoldermgr.cpp:153 kmkernel.cpp:1383
+#: kmfoldermgr.cpp:153 kmkernel.cpp:1382
 msgid ""
 "The permissions of the folder '%1' are incorrect;\n"
 "please make sure that you can view and modify the content of this folder."
@@ -7955,7 +7955,7 @@ msgstr ""
 "The permissions of the folder '%1' are incorrect;\n"
 "please make sure that you can view and modify the content of this folder."
 
-#: kmfoldermgr.cpp:163 kmkernel.cpp:1375
+#: kmfoldermgr.cpp:163 kmkernel.cpp:1374
 msgid ""
 "KMail could not create folder '%1';\n"
 "please make sure that you can view and modify the content of the folder '%2'."
@@ -7974,7 +7974,7 @@ msgstr ""
 msgid "Could Not Create Folder"
 msgstr "Failed to create folder"
 
-#: kmfoldermgr.cpp:329 kmkernel.cpp:1691
+#: kmfoldermgr.cpp:329 kmkernel.cpp:1690
 msgid ""
 "Cannot create file `%1' in %2.\n"
 "KMail cannot start without it."
@@ -7995,7 +7995,7 @@ msgstr "Create a new subfolder under the currently selected folder"
 msgid "You can start typing to filter the list of folders"
 msgstr ""
 
-#: kmfoldertree.cpp:407 kmheaders.cpp:130
+#: kmfoldertree.cpp:407 kmheaders.cpp:129
 msgid "View Columns"
 msgstr "View Columns"
 
@@ -8032,11 +8032,11 @@ msgstr "Go To"
 msgid "Do Not Go To"
 msgstr "Do Not Go To"
 
-#: kmfoldertree.cpp:1092 kmmainwidget.cpp:2780
+#: kmfoldertree.cpp:1092 kmmainwidget.cpp:2779
 msgid "&New Folder..."
 msgstr "&New Folder..."
 
-#: kmfoldertree.cpp:1103 kmmainwidget.cpp:2668
+#: kmfoldertree.cpp:1103 kmmainwidget.cpp:2667
 msgid "Check &Mail"
 msgstr "Check &Mail"
 
@@ -8068,7 +8068,7 @@ msgstr "Subscription..."
 msgid "Refresh Folder List"
 msgstr "Refresh Folder List"
 
-#: kmfoldertree.cpp:1177 kmmainwidget.cpp:3771
+#: kmfoldertree.cpp:1177 kmmainwidget.cpp:3770
 msgid "&Troubleshoot IMAP Cache..."
 msgstr "&Troubleshoot IMAP Cache..."
 
@@ -8083,13 +8083,13 @@ msgstr ""
 "the server. If you think you should be able to create subfolders here, ask "
 "your administrator to grant you rights to do so.</qt> "
 
-#: kmfoldertree.cpp:1695 kmmainwidget.cpp:412 kmmainwidget.cpp:419
-#: kmmainwidget.cpp:426 kmsearchpattern.h:220
+#: kmfoldertree.cpp:1695 kmmainwidget.cpp:411 kmmainwidget.cpp:418
+#: kmmainwidget.cpp:425 kmsearchpattern.h:219
 msgid "Unread"
 msgstr "Unread"
 
-#: kmfoldertree.cpp:1708 kmmainwidget.cpp:414 kmmainwidget.cpp:421
-#: kmmainwidget.cpp:428
+#: kmfoldertree.cpp:1708 kmmainwidget.cpp:413 kmmainwidget.cpp:420
+#: kmmainwidget.cpp:427
 msgid "Total"
 msgstr "Total"
 
@@ -8117,61 +8117,61 @@ msgstr "<qt>Cannot move folder <b>%1</b> into a subfolder below itself.</qt>"
 msgid "Moving the selected folders is not possible"
 msgstr ""
 
-#: kmheaders.cpp:132
+#: kmheaders.cpp:131
 msgid "Status"
 msgstr "Status"
 
-#: kmheaders.cpp:133 kmsearchpattern.h:218
+#: kmheaders.cpp:132 kmsearchpattern.h:217
 msgid "Important"
 msgstr "Important"
 
-#: kmheaders.cpp:134
+#: kmheaders.cpp:133
 msgid "Action Item"
 msgstr ""
 
-#: kmheaders.cpp:135
+#: kmheaders.cpp:134
 msgid "Attachment"
 msgstr "Attachment"
 
-#: kmheaders.cpp:136 kmsearchpattern.h:233
+#: kmheaders.cpp:135 kmsearchpattern.h:232
 #, fuzzy
 msgid "Invitation"
 msgstr "Documentation"
 
-#: kmheaders.cpp:137
+#: kmheaders.cpp:136
 msgid "Spam/Ham"
 msgstr "Spam/Ham"
 
-#: kmheaders.cpp:138
+#: kmheaders.cpp:137
 msgid "Watched/Ignored"
 msgstr "Watched/Ignored"
 
-#: kmheaders.cpp:139
+#: kmheaders.cpp:138
 msgid "Signature"
 msgstr "Signature"
 
-#: kmheaders.cpp:184 kmheaders.cpp:804 kmheaders.cpp:2646
-#: kmpopfiltercnfrmdlg.cpp:39 kmsearchpatternedit.cpp:41 searchwindow.cpp:223
+#: kmheaders.cpp:183 kmheaders.cpp:803 kmheaders.cpp:2645
+#: kmpopfiltercnfrmdlg.cpp:39 kmsearchpatternedit.cpp:40 searchwindow.cpp:223
 #: templatesinsertcommand.cpp:145 templatesinsertcommand.cpp:246
 msgid "Subject"
 msgstr "Subject"
 
-#: kmheaders.cpp:186 kmheaders.cpp:799 kmheaders.cpp:2641
+#: kmheaders.cpp:185 kmheaders.cpp:798 kmheaders.cpp:2640
 #: kmpopfiltercnfrmdlg.cpp:42 searchwindow.cpp:227
 #: templatesinsertcommand.cpp:66 templatesinsertcommand.cpp:170
 msgid "Date"
 msgstr "Date"
 
-#: kmheaders.cpp:801 kmheaders.cpp:2643
+#: kmheaders.cpp:800 kmheaders.cpp:2642
 #, fuzzy
 msgid "Order of Arrival"
 msgstr "Date (Order of Arrival)"
 
-#: kmheaders.cpp:806 kmheaders.cpp:2648
+#: kmheaders.cpp:805 kmheaders.cpp:2647
 msgid " (Status)"
 msgstr " (Status)"
 
-#: kmheaders.cpp:1398
+#: kmheaders.cpp:1397
 #, c-format
 msgid ""
 "_n: 1 unsent\n"
@@ -8180,11 +8180,11 @@ msgstr ""
 "1 unsent\n"
 "%n unsent"
 
-#: kmheaders.cpp:1398
+#: kmheaders.cpp:1397
 msgid "0 unsent"
 msgstr "0 unsent"
 
-#: kmheaders.cpp:1400
+#: kmheaders.cpp:1399
 #, c-format
 msgid ""
 "_n: 1 unread\n"
@@ -8193,11 +8193,11 @@ msgstr ""
 "1 unread\n"
 "%n unread"
 
-#: kmheaders.cpp:1400
+#: kmheaders.cpp:1399
 msgid "0 unread"
 msgstr "0 unread"
 
-#: kmheaders.cpp:1402
+#: kmheaders.cpp:1401
 msgid ""
 "_n: 1 message, %1.\n"
 "%n messages, %1."
@@ -8205,17 +8205,17 @@ msgstr ""
 "1 message, %1.\n"
 "%n messages, %1."
 
-#: kmheaders.cpp:1403
+#: kmheaders.cpp:1402
 msgid "0 messages"
 msgstr "0 messages"
 
-#: kmheaders.cpp:1405
+#: kmheaders.cpp:1404
 msgid ""
 "_: %1 = n messages, m unread.\n"
 "%1 Folder is read-only."
 msgstr "%1 Folder is read-only."
 
-#: kmheaders.cpp:1598
+#: kmheaders.cpp:1597
 #, c-format
 msgid ""
 "_n: <qt>Do you really want to delete the selected message?<br>Once deleted, "
@@ -8228,49 +8228,49 @@ msgstr ""
 "<qt>Do you really want to delete the %n selected messages?<br>Once deleted, "
 "they cannot be restored.</qt>"
 
-#: kmheaders.cpp:1600
+#: kmheaders.cpp:1599
 msgid "Delete Messages"
 msgstr "Delete Messages"
 
-#: kmheaders.cpp:1600
+#: kmheaders.cpp:1599
 msgid "Delete Message"
 msgstr "Delete Message"
 
-#: kmheaders.cpp:1624
+#: kmheaders.cpp:1623
 msgid "Messages deleted successfully."
 msgstr "Messages deleted successfully."
 
-#: kmheaders.cpp:1624
+#: kmheaders.cpp:1623
 msgid "Messages moved successfully"
 msgstr "Messages moved successfully"
 
-#: kmheaders.cpp:1647
+#: kmheaders.cpp:1646
 msgid "Deleting messages failed."
 msgstr "Deleting messages failed."
 
-#: kmheaders.cpp:1647
+#: kmheaders.cpp:1646
 msgid "Moving messages failed."
 msgstr "Moving messages failed."
 
-#: kmheaders.cpp:1650
+#: kmheaders.cpp:1649
 msgid "Deleting messages canceled."
 msgstr "Deleting messages cancelled."
 
-#: kmheaders.cpp:1650
+#: kmheaders.cpp:1649
 msgid "Moving messages canceled."
 msgstr "Moving messages cancelled."
 
-#: kmheaders.cpp:2470 kmmainwidget.cpp:2989 kmreadermainwin.cpp:508
+#: kmheaders.cpp:2469 kmmainwidget.cpp:2988 kmreadermainwin.cpp:508
 #: searchwindow.cpp:856
 msgid "&Copy To"
 msgstr "&Copy To"
 
-#: kmheaders.cpp:2473 kmheaders.cpp:2479 kmmainwidget.cpp:2986
+#: kmheaders.cpp:2472 kmheaders.cpp:2478 kmmainwidget.cpp:2985
 #: searchwindow.cpp:857
 msgid "&Move To"
 msgstr "&Move To"
 
-#: kmheaders.cpp:2818 kmheaders.cpp:2858
+#: kmheaders.cpp:2817 kmheaders.cpp:2857
 msgid ""
 "Failure modifying %1\n"
 "(No space left on device?)"
@@ -8278,85 +8278,85 @@ msgstr ""
 "Failure modifying %1\n"
 "(No space left on device?)"
 
-#: kmkernel.cpp:727
+#: kmkernel.cpp:726
 msgid "Certificate Signature Request"
 msgstr "Certificate Signature Request"
 
-#: kmkernel.cpp:730
+#: kmkernel.cpp:729
 msgid "Please create a certificate from attachment and return to sender."
 msgstr "Please create a certificate from attachment and return to sender."
 
-#: kmkernel.cpp:1261
+#: kmkernel.cpp:1260
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr "KMail is set to be offline; all network jobs are suspended"
 
-#: kmkernel.cpp:1271
+#: kmkernel.cpp:1270
 msgid "KMail is set to be online; all network jobs resumed"
 msgstr "KMail is set to be online; all network jobs resumed"
 
-#: kmkernel.cpp:1298
+#: kmkernel.cpp:1297
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr "KMail is currently in offline mode. How do you want to proceed?"
 
-#: kmkernel.cpp:1301 kmmainwidget.cpp:1924
+#: kmkernel.cpp:1300 kmmainwidget.cpp:1923
 msgid "Work Online"
 msgstr "Work Online"
 
-#: kmkernel.cpp:1302 kmmainwidget.cpp:1922
+#: kmkernel.cpp:1301 kmmainwidget.cpp:1921
 msgid "Work Offline"
 msgstr "Work Offline"
 
-#: kmkernel.cpp:1444
+#: kmkernel.cpp:1443
 msgid "You do not have read/write permission to your inbox folder."
 msgstr "You do not have read/write permission to your inbox folder."
 
-#: kmkernel.cpp:1452
+#: kmkernel.cpp:1451
 msgid "outbox"
 msgstr "outbox"
 
-#: kmkernel.cpp:1454
+#: kmkernel.cpp:1453
 msgid "You do not have read/write permission to your outbox folder."
 msgstr "You do not have read/write permission to your outbox folder."
 
-#: kmkernel.cpp:1471
+#: kmkernel.cpp:1470
 msgid "sent-mail"
 msgstr "sent-mail"
 
-#: kmkernel.cpp:1473
+#: kmkernel.cpp:1472
 msgid "You do not have read/write permission to your sent-mail folder."
 msgstr "You do not have read/write permission to your sent-mail folder."
 
-#: kmkernel.cpp:1480
+#: kmkernel.cpp:1479
 msgid "trash"
 msgstr "wastebin"
 
-#: kmkernel.cpp:1482
+#: kmkernel.cpp:1481
 msgid "You do not have read/write permission to your trash folder."
 msgstr "You do not have read/write permission to your wastebin folder."
 
-#: kmkernel.cpp:1489
+#: kmkernel.cpp:1488
 msgid "drafts"
 msgstr "drafts"
 
-#: kmkernel.cpp:1491
+#: kmkernel.cpp:1490
 msgid "You do not have read/write permission to your drafts folder."
 msgstr "You do not have read/write permission to your drafts folder."
 
-#: kmkernel.cpp:1500
+#: kmkernel.cpp:1499
 #, fuzzy
 msgid "templates"
 msgstr "&Replace"
 
-#: kmkernel.cpp:1502
+#: kmkernel.cpp:1501
 #, fuzzy
 msgid "You do not have read/write permission to your templates folder."
 msgstr "You do not have read/write permission to your wastebin folder."
 
-#: kmkernel.cpp:1546 searchwindow.cpp:256 searchwindow.cpp:477
+#: kmkernel.cpp:1545 searchwindow.cpp:256 searchwindow.cpp:477
 msgid "Last Search"
 msgstr "Last Search"
 
-#: kmkernel.cpp:1731
+#: kmkernel.cpp:1730
 msgid ""
 "There is a problem with the mail index of the following folders, the indices "
 "will now be regenerated.\n"
@@ -8366,11 +8366,11 @@ msgid ""
 "Some information, like status flags, might get lost."
 msgstr ""
 
-#: kmkernel.cpp:1736
+#: kmkernel.cpp:1735
 msgid "Problem with mail indices"
 msgstr ""
 
-#: kmkernel.cpp:1894
+#: kmkernel.cpp:1893
 msgid ""
 "_: %1-%3 is the application name, %4-%7 are folder path\n"
 "<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
@@ -8383,7 +8383,7 @@ msgstr ""
 "though this may replace any existing files with the same name in <i>%7</i>."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 
-#: kmkernel.cpp:1906
+#: kmkernel.cpp:1905
 msgid ""
 "_: %1-%3 is the application name, %4-%6 are folder path\n"
 "<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
@@ -8394,15 +8394,15 @@ msgstr ""
 "messages. %2 can move the contents of <i>%6</i> into this folder for you."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 
-#: kmkernel.cpp:1915
+#: kmkernel.cpp:1914
 msgid "Migrate Mail Files?"
 msgstr "Migrate Mail Files?"
 
-#: kmkernel.cpp:2150
+#: kmkernel.cpp:2149
 msgid "KMail encountered a fatal error and will terminate now"
 msgstr "KMail encountered a fatal error and will terminate now"
 
-#: kmkernel.cpp:2152
+#: kmkernel.cpp:2151
 #, c-format
 msgid ""
 "KMail encountered a fatal error and will terminate now.\n"
@@ -8413,76 +8413,76 @@ msgstr ""
 "The error was:\n"
 "%1"
 
-#: kmkernel.cpp:2285 kmmainwidget.cpp:1151
+#: kmkernel.cpp:2284 kmmainwidget.cpp:1150
 msgid "Empty Trash"
 msgstr "Empty Wastebin"
 
-#: kmkernel.cpp:2286
+#: kmkernel.cpp:2285
 msgid "Are you sure you want to empty the trash folders of all accounts?"
 msgstr "Are you sure you want to empty the wastebin folders of all accounts?"
 
-#: kmlineeditspell.cpp:134
+#: kmlineeditspell.cpp:133
 msgid "vCard Import Failed"
 msgstr "vCard Import Failed"
 
-#: kmlineeditspell.cpp:135
+#: kmlineeditspell.cpp:134
 msgid "<qt>Unable to access <b>%1</b>.</qt>"
 msgstr "<qt>Unable to access <b>%1</b>.</qt>"
 
-#: kmlineeditspell.cpp:194 recipientspicker.cpp:578
+#: kmlineeditspell.cpp:193 recipientspicker.cpp:578
 msgid "Recent Addresses"
 msgstr "Recent Addresses"
 
-#: kmmainwidget.cpp:601
+#: kmmainwidget.cpp:600
 msgid "S&earch:"
 msgstr "S&earch:"
 
-#: kmmainwidget.cpp:664 kmmainwidget.cpp:1686
+#: kmmainwidget.cpp:663 kmmainwidget.cpp:1685
 msgid "Move Message to Folder"
 msgstr "Move Message to Folder"
 
-#: kmmainwidget.cpp:669 kmmainwidget.cpp:1795
+#: kmmainwidget.cpp:668 kmmainwidget.cpp:1794
 msgid "Copy Message to Folder"
 msgstr "Copy Message to Folder"
 
-#: kmmainwidget.cpp:674 kmmainwidget.cpp:1674
+#: kmmainwidget.cpp:673 kmmainwidget.cpp:1673
 #, fuzzy
 msgid "Jump to Folder"
 msgstr "Copy Into Folder"
 
-#: kmmainwidget.cpp:717
+#: kmmainwidget.cpp:716
 msgid "Remove Duplicate Messages"
 msgstr "Remove Duplicate Messages"
 
-#: kmmainwidget.cpp:722
+#: kmmainwidget.cpp:721
 msgid "Abort Current Operation"
 msgstr "Abort Current Operation"
 
-#: kmmainwidget.cpp:727
+#: kmmainwidget.cpp:726
 msgid "Focus on Next Folder"
 msgstr "Focus on Next Folder"
 
-#: kmmainwidget.cpp:732
+#: kmmainwidget.cpp:731
 msgid "Focus on Previous Folder"
 msgstr "Focus on Previous Folder"
 
-#: kmmainwidget.cpp:737
+#: kmmainwidget.cpp:736
 msgid "Select Folder with Focus"
 msgstr "Select Folder with Focus"
 
-#: kmmainwidget.cpp:742
+#: kmmainwidget.cpp:741
 msgid "Focus on Next Message"
 msgstr "Focus on Next Message"
 
-#: kmmainwidget.cpp:747
+#: kmmainwidget.cpp:746
 msgid "Focus on Previous Message"
 msgstr "Focus on Previous Message"
 
-#: kmmainwidget.cpp:752
+#: kmmainwidget.cpp:751
 msgid "Select Message with Focus"
 msgstr "Select Message with Focus"
 
-#: kmmainwidget.cpp:951
+#: kmmainwidget.cpp:950
 msgid ""
 "_n: 1 new message in %1\n"
 "%n new messages in %1"
@@ -8490,46 +8490,46 @@ msgstr ""
 "1 new message in %1\n"
 "%n new messages in %1"
 
-#: kmmainwidget.cpp:967
+#: kmmainwidget.cpp:966
 msgid ""
 "_: %1 is a list of the number of new messages per folder\n"
 "<b>New mail arrived</b><br>%1"
 msgstr "<b>New mail arrived</b><br>%1"
 
-#: kmmainwidget.cpp:971
+#: kmmainwidget.cpp:970
 msgid "New mail arrived"
 msgstr "New mail arrived"
 
-#: kmmainwidget.cpp:1100
+#: kmmainwidget.cpp:1099
 #, c-format
 msgid "Properties of Folder %1"
 msgstr "Properties of Folder %1"
 
-#: kmmainwidget.cpp:1124
+#: kmmainwidget.cpp:1123
 msgid "This folder does not have any expiry options set"
 msgstr "This folder does not have any expiry options set"
 
-#: kmmainwidget.cpp:1132
+#: kmmainwidget.cpp:1131
 msgid "<qt>Are you sure you want to expire the folder <b>%1</b>?</qt>"
 msgstr "<qt>Are you sure you want to expire the folder <b>%1</b>?</qt>"
 
-#: kmmainwidget.cpp:1133
+#: kmmainwidget.cpp:1132
 msgid "Expire Folder"
 msgstr "Expire Folder"
 
-#: kmmainwidget.cpp:1134
+#: kmmainwidget.cpp:1133
 msgid "&Expire"
 msgstr "&Expire"
 
-#: kmmainwidget.cpp:1151
+#: kmmainwidget.cpp:1150
 msgid "Move to Trash"
 msgstr "Move to Wastebin"
 
-#: kmmainwidget.cpp:1153
+#: kmmainwidget.cpp:1152
 msgid "Are you sure you want to empty the trash folder?"
 msgstr "Are you sure you want to empty the wastebin folder?"
 
-#: kmmainwidget.cpp:1154
+#: kmmainwidget.cpp:1153
 msgid ""
 "<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
 "trash?</qt>"
@@ -8537,27 +8537,27 @@ msgstr ""
 "<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
 "wastebin?</qt>"
 
-#: kmmainwidget.cpp:1173
+#: kmmainwidget.cpp:1172
 msgid "Moved all messages to the trash"
 msgstr "Moved all messages to the wastebin"
 
-#: kmmainwidget.cpp:1200
+#: kmmainwidget.cpp:1199
 msgid ""
 "It is not possible to delete this folder right now because it is being "
 "syncronized. Please wait until the syncronization of this folder is complete "
 "and then try again."
 msgstr ""
 
-#: kmmainwidget.cpp:1203
+#: kmmainwidget.cpp:1202
 #, fuzzy
 msgid "Unable to delete folder"
 msgstr "Failed to create folder"
 
-#: kmmainwidget.cpp:1209
+#: kmmainwidget.cpp:1208
 msgid "Delete Search"
 msgstr "Delete Search"
 
-#: kmmainwidget.cpp:1210
+#: kmmainwidget.cpp:1209
 msgid ""
 "<qt>Are you sure you want to delete the search <b>%1</b>?<br>Any messages it "
 "shows will still be available in their original folder.</qt>"
@@ -8565,15 +8565,15 @@ msgstr ""
 "<qt>Are you sure you want to delete the search <b>%1</b>?<br>Any messages it "
 "shows will still be available in their original folder.</qt>"
 
-#: kmmainwidget.cpp:1214
+#: kmmainwidget.cpp:1213
 msgid "Delete Folder"
 msgstr "Delete Folder"
 
-#: kmmainwidget.cpp:1217
+#: kmmainwidget.cpp:1216
 msgid "<qt>Are you sure you want to delete the empty folder <b>%1</b>?</qt>"
 msgstr "<qt>Are you sure you want to delete the empty folder <b>%1</b>?</qt>"
 
-#: kmmainwidget.cpp:1222
+#: kmmainwidget.cpp:1221
 #, fuzzy
 msgid ""
 "<qt>Are you sure you want to delete the empty folder <b>%1</b> and all its "
@@ -8586,7 +8586,7 @@ msgstr ""
 "discarded as well. <p><b>Beware</b> that discarded messages are not saved "
 "into your Wastebin folder and are permanently deleted.</qt>"
 
-#: kmmainwidget.cpp:1231
+#: kmmainwidget.cpp:1230
 #, fuzzy
 msgid ""
 "<qt>Are you sure you want to delete the folder <b>%1</b>, discarding its "
@@ -8597,7 +8597,7 @@ msgstr ""
 "contents? <p><b>Beware</b> that discarded messages are not saved into your "
 "Wastebin folder and are permanently deleted.</qt>"
 
-#: kmmainwidget.cpp:1238
+#: kmmainwidget.cpp:1237
 #, fuzzy
 msgid ""
 "<qt>Are you sure you want to delete the folder <b>%1</b> and all its "
@@ -8610,7 +8610,7 @@ msgstr ""
 "messages are not saved into your Wastebin folder and are permanently deleted."
 "</qt>"
 
-#: kmmainwidget.cpp:1313
+#: kmmainwidget.cpp:1312
 msgid ""
 "Are you sure you want to refresh the IMAP cache?\n"
 "This will remove all changes that you have done locally to your IMAP folders."
@@ -8618,11 +8618,11 @@ msgstr ""
 "Are you sure you want to refresh the IMAP cache?\n"
 "This will remove all changes that you have done locally to your IMAP folders."
 
-#: kmmainwidget.cpp:1329
+#: kmmainwidget.cpp:1328
 msgid "Are you sure you want to expire all old messages?"
 msgstr "Are you sure you want to expire all old messages?"
 
-#: kmmainwidget.cpp:1353
+#: kmmainwidget.cpp:1352
 msgid ""
 "Use of HTML in mail will make you more vulnerable to \"spam\" and may "
 "increase the likelihood that your system will be compromised by other "
@@ -8632,15 +8632,15 @@ msgstr ""
 "increase the likelihood that your system will be compromised by other "
 "present and anticipated security exploits."
 
-#: kmmainwidget.cpp:1356 kmmainwidget.cpp:1380 kmsender.cpp:504
+#: kmmainwidget.cpp:1355 kmmainwidget.cpp:1379 kmsender.cpp:504
 msgid "Security Warning"
 msgstr "Security Warning"
 
-#: kmmainwidget.cpp:1357
+#: kmmainwidget.cpp:1356
 msgid "Use HTML"
 msgstr "Use HTML"
 
-#: kmmainwidget.cpp:1377
+#: kmmainwidget.cpp:1376
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
 "\"spam\" and may increase the likelihood that your system will be "
@@ -8650,19 +8650,19 @@ msgstr ""
 "\"spam\" and may increase the likelihood that your system will be "
 "compromised by other present and anticipated security exploits."
 
-#: kmmainwidget.cpp:1381
+#: kmmainwidget.cpp:1380
 msgid "Load External References"
 msgstr "Load External References"
 
-#: kmmainwidget.cpp:1634
+#: kmmainwidget.cpp:1633
 msgid "Filter on Mailing-List..."
 msgstr "Filter on Mailing-List..."
 
-#: kmmainwidget.cpp:1639
+#: kmmainwidget.cpp:1638
 msgid "Filter on Mailing-List %1..."
 msgstr "Filter on Mailing-List %1..."
 
-#: kmmainwidget.cpp:1738
+#: kmmainwidget.cpp:1737
 msgid ""
 "KMail's Out of Office Reply functionality relies on server-side filtering. "
 "You have not yet configured an IMAP server for this.\n"
@@ -8672,18 +8672,18 @@ msgstr ""
 "You have not yet configured an IMAP server for this.\n"
 "You can do this on the \"Filtering\" tab of the IMAP account configuration."
 
-#: kmmainwidget.cpp:1743
+#: kmmainwidget.cpp:1742
 msgid "No Server-Side Filtering Configured"
 msgstr "No Server-Side Filtering Configured"
 
-#: kmmainwidget.cpp:1770
+#: kmmainwidget.cpp:1769
 #, fuzzy
 msgid ""
 "Could not start certificate manager 'kleopatra'; please check your "
 "installation."
 msgstr "Could not start certificate manager; please check your installation."
 
-#: kmmainwidget.cpp:1787
+#: kmmainwidget.cpp:1786
 msgid ""
 "Could not start GnuPG LogViewer (kwatchgnupg); please check your "
 "installation."
@@ -8691,498 +8691,498 @@ msgstr ""
 "Could not start GnuPG LogViewer (kwatchgnupg); please check your "
 "installation."
 
-#: kmmainwidget.cpp:2508
+#: kmmainwidget.cpp:2507
 #, fuzzy
 msgid "Forward With Custom Template"
 msgstr "&Use custom message-id suffix"
 
-#: kmmainwidget.cpp:2517
+#: kmmainwidget.cpp:2516
 #, fuzzy
 msgid "Reply With Custom Template"
 msgstr "&Use custom message-id suffix"
 
-#: kmmainwidget.cpp:2525
+#: kmmainwidget.cpp:2524
 #, fuzzy
 msgid "Reply to All With Custom Template"
 msgstr "&Use custom message-id suffix"
 
-#: kmmainwidget.cpp:2620 kmmainwidget.cpp:2625 kmmainwidget.cpp:2630
+#: kmmainwidget.cpp:2619 kmmainwidget.cpp:2624 kmmainwidget.cpp:2629
 #, fuzzy
 msgid "(no custom templates)"
 msgstr "&Use custom message-id suffix"
 
-#: kmmainwidget.cpp:2645 kmmimeparttree.cpp:139
+#: kmmainwidget.cpp:2644 kmmimeparttree.cpp:139
 msgid "Save &As..."
 msgstr "Save &As..."
 
-#: kmmainwidget.cpp:2652
+#: kmmainwidget.cpp:2651
 msgid "&Compact All Folders"
 msgstr "&Compact All Folders"
 
-#: kmmainwidget.cpp:2656
+#: kmmainwidget.cpp:2655
 msgid "&Expire All Folders"
 msgstr "&Expire All Folders"
 
-#: kmmainwidget.cpp:2660
+#: kmmainwidget.cpp:2659
 msgid "&Refresh Local IMAP Cache"
 msgstr "&Refresh Local IMAP Cache"
 
-#: kmmainwidget.cpp:2664
+#: kmmainwidget.cpp:2663
 msgid "Empty All &Trash Folders"
 msgstr "Empty All &Wastebin Folders"
 
-#: kmmainwidget.cpp:2672
+#: kmmainwidget.cpp:2671
 #, fuzzy
 msgid "Check Mail in Favorite Folders"
 msgstr "Check Mail &in This Folder"
 
-#: kmmainwidget.cpp:2679
+#: kmmainwidget.cpp:2678
 msgid "Check Mail &In"
 msgstr "Check Mail &In"
 
-#: kmmainwidget.cpp:2689
+#: kmmainwidget.cpp:2688
 msgid "&Send Queued Messages"
 msgstr "&Send Queued Messages"
 
-#: kmmainwidget.cpp:2692
+#: kmmainwidget.cpp:2691
 msgid "Online Status (unknown)"
 msgstr "Online Status (unknown)"
 
-#: kmmainwidget.cpp:2696
+#: kmmainwidget.cpp:2695
 msgid "Send Queued Messages Via"
 msgstr "Send Queued Messages Via"
 
-#: kmmainwidget.cpp:2707
+#: kmmainwidget.cpp:2706
 msgid "&Address Book..."
 msgstr "&Address Book..."
 
-#: kmmainwidget.cpp:2712
+#: kmmainwidget.cpp:2711
 msgid "Certificate Manager..."
 msgstr "Certificate Manager..."
 
-#: kmmainwidget.cpp:2717
+#: kmmainwidget.cpp:2716
 msgid "GnuPG Log Viewer..."
 msgstr "GnuPG Log Viewer..."
 
-#: kmmainwidget.cpp:2722
+#: kmmainwidget.cpp:2721
 msgid "&Import Messages..."
 msgstr "&Import Messages..."
 
-#: kmmainwidget.cpp:2727
+#: kmmainwidget.cpp:2726
 msgid "&Debug Sieve..."
 msgstr "&Debug Sieve..."
 
-#: kmmainwidget.cpp:2733
+#: kmmainwidget.cpp:2732
 msgid "Edit \"Out of Office\" Replies..."
 msgstr "Edit \"Out of Office\" Replies..."
 
-#: kmmainwidget.cpp:2739
+#: kmmainwidget.cpp:2738
 msgid "Filter &Log Viewer..."
 msgstr "Filter &Log Viewer..."
 
-#: kmmainwidget.cpp:2742
+#: kmmainwidget.cpp:2741
 msgid "&Anti-Spam Wizard..."
 msgstr "&Anti-Spam Wizard..."
 
-#: kmmainwidget.cpp:2744
+#: kmmainwidget.cpp:2743
 msgid "&Anti-Virus Wizard..."
 msgstr "&Anti-Virus Wizard..."
 
-#: kmmainwidget.cpp:2748 kmreadermainwin.cpp:367
+#: kmmainwidget.cpp:2747 kmreadermainwin.cpp:367
 msgid "&Move to Trash"
 msgstr "&Move to Wastebin"
 
-#: kmmainwidget.cpp:2749 kmreadermainwin.cpp:368
+#: kmmainwidget.cpp:2748 kmreadermainwin.cpp:368
 msgid "Move message to trashcan"
 msgstr "Move message to wastebin"
 
-#: kmmainwidget.cpp:2761
+#: kmmainwidget.cpp:2760
 msgid "M&ove Thread to Trash"
 msgstr "M&ove Thread to Wastebin"
 
-#: kmmainwidget.cpp:2762
+#: kmmainwidget.cpp:2761
 msgid "Move thread to trashcan"
 msgstr "Move thread to wastebin"
 
-#: kmmainwidget.cpp:2766
+#: kmmainwidget.cpp:2765
 msgid "Delete T&hread"
 msgstr "Delete T&hread"
 
-#: kmmainwidget.cpp:2770
+#: kmmainwidget.cpp:2769
 msgid "&Find Messages..."
 msgstr "&Find Messages..."
 
-#: kmmainwidget.cpp:2773
+#: kmmainwidget.cpp:2772
 msgid "&Find in Message..."
 msgstr "&Find in Message..."
 
-#: kmmainwidget.cpp:2776
+#: kmmainwidget.cpp:2775
 msgid "Select &All Messages"
 msgstr "Select &All Messages"
 
-#: kmmainwidget.cpp:2783
+#: kmmainwidget.cpp:2782
 msgid "&Properties"
 msgstr "&Properties"
 
-#: kmmainwidget.cpp:2786
+#: kmmainwidget.cpp:2785
 #, fuzzy
 msgid "&Mailing List Management..."
 msgstr "&Mailing List Management"
 
-#: kmmainwidget.cpp:2795
+#: kmmainwidget.cpp:2794
 msgid "Mark All Messages as &Read"
 msgstr "Mark All Messages as &Read"
 
-#: kmmainwidget.cpp:2798
+#: kmmainwidget.cpp:2797
 msgid "&Expiration Settings"
 msgstr "&Expiration Settings"
 
-#: kmmainwidget.cpp:2801
+#: kmmainwidget.cpp:2800
 msgid "&Compact Folder"
 msgstr "&Compact Folder"
 
-#: kmmainwidget.cpp:2804
+#: kmmainwidget.cpp:2803
 msgid "Check Mail &in This Folder"
 msgstr "Check Mail &in This Folder"
 
-#: kmmainwidget.cpp:2816
+#: kmmainwidget.cpp:2815
 #, fuzzy
 msgid "&Archive Folder..."
 msgstr "&New Folder..."
 
-#: kmmainwidget.cpp:2820
+#: kmmainwidget.cpp:2819
 msgid "Prefer &HTML to Plain Text"
 msgstr "Prefer &HTML to Plain Text"
 
-#: kmmainwidget.cpp:2823
+#: kmmainwidget.cpp:2822
 msgid "Load E&xternal References"
 msgstr "Load E&xternal References"
 
-#: kmmainwidget.cpp:2826
+#: kmmainwidget.cpp:2825
 msgid "&Thread Messages"
 msgstr "&Thread Messages"
 
-#: kmmainwidget.cpp:2829
+#: kmmainwidget.cpp:2828
 msgid "Thread Messages also by &Subject"
 msgstr "Thread Messages also by &Subject"
 
-#: kmmainwidget.cpp:2832
+#: kmmainwidget.cpp:2831
 #, fuzzy
 msgid "Copy Folder"
 msgstr "Copy Into Folder"
 
-#: kmmainwidget.cpp:2834
+#: kmmainwidget.cpp:2833
 #, fuzzy
 msgid "Cut Folder"
 msgstr "Folder"
 
-#: kmmainwidget.cpp:2836
+#: kmmainwidget.cpp:2835
 #, fuzzy
 msgid "Paste Folder"
 msgstr "New Folder"
 
-#: kmmainwidget.cpp:2839
+#: kmmainwidget.cpp:2838
 #, fuzzy
 msgid "Copy Messages"
 msgstr "Open Message"
 
-#: kmmainwidget.cpp:2841
+#: kmmainwidget.cpp:2840
 #, fuzzy
 msgid "Cut Messages"
 msgstr " messages"
 
-#: kmmainwidget.cpp:2843
+#: kmmainwidget.cpp:2842
 #, fuzzy
 msgid "Paste Messages"
 msgstr "Delete Messages"
 
-#: kmmainwidget.cpp:2847
+#: kmmainwidget.cpp:2846
 msgid "&New Message..."
 msgstr "&New Message..."
 
-#: kmmainwidget.cpp:2850 kmmainwidget.cpp:2927
+#: kmmainwidget.cpp:2849 kmmainwidget.cpp:2926
 #, fuzzy
 msgid "New Message From &Template"
 msgstr "No new messages from server"
 
-#: kmmainwidget.cpp:2858
+#: kmmainwidget.cpp:2857
 msgid "New Message t&o Mailing-List..."
 msgstr "New Message t&o Mailing-List..."
 
-#: kmmainwidget.cpp:2863 kmreadermainwin.cpp:378 searchwindow.cpp:321
+#: kmmainwidget.cpp:2862 kmreadermainwin.cpp:378 searchwindow.cpp:321
 msgid ""
 "_: Message->\n"
 "&Forward"
 msgstr "&Forward"
 
-#: kmmainwidget.cpp:2867 kmreadermainwin.cpp:381 searchwindow.cpp:330
+#: kmmainwidget.cpp:2866 kmreadermainwin.cpp:381 searchwindow.cpp:330
 msgid "&Inline..."
 msgstr "&Inline..."
 
-#: kmmainwidget.cpp:2873 kmreadermainwin.cpp:387 searchwindow.cpp:326
+#: kmmainwidget.cpp:2872 kmreadermainwin.cpp:387 searchwindow.cpp:326
 msgid ""
 "_: Message->Forward->\n"
 "As &Attachment..."
 msgstr "As &Attachment..."
 
-#: kmmainwidget.cpp:2879 kmreadermainwin.cpp:393 searchwindow.cpp:342
+#: kmmainwidget.cpp:2878 kmreadermainwin.cpp:393 searchwindow.cpp:342
 #, fuzzy
 msgid ""
 "_: Message->Forward->\n"
 "As Di&gest..."
 msgstr "As &Attachment..."
 
-#: kmmainwidget.cpp:2885 kmreadermainwin.cpp:399 searchwindow.cpp:347
+#: kmmainwidget.cpp:2884 kmreadermainwin.cpp:399 searchwindow.cpp:347
 msgid ""
 "_: Message->Forward->\n"
 "&Redirect..."
 msgstr "&Redirect..."
 
-#: kmmainwidget.cpp:2897
+#: kmmainwidget.cpp:2896
 msgid "Send A&gain..."
 msgstr "Send A&gain..."
 
-#: kmmainwidget.cpp:2902
+#: kmmainwidget.cpp:2901
 msgid "&Create Filter"
 msgstr "&Create Filter"
 
-#: kmmainwidget.cpp:2905
+#: kmmainwidget.cpp:2904
 msgid "Filter on &Subject..."
 msgstr "Filter on &Subject..."
 
-#: kmmainwidget.cpp:2910
+#: kmmainwidget.cpp:2909
 msgid "Filter on &From..."
 msgstr "Filter on &From..."
 
-#: kmmainwidget.cpp:2915
+#: kmmainwidget.cpp:2914
 msgid "Filter on &To..."
 msgstr "Filter on &To..."
 
-#: kmmainwidget.cpp:2920
+#: kmmainwidget.cpp:2919
 msgid "Filter on Mailing-&List..."
 msgstr "Filter on Mailing-&List..."
 
-#: kmmainwidget.cpp:2933
+#: kmmainwidget.cpp:2932
 msgid "Mark &Thread"
 msgstr "Mark &Thread"
 
-#: kmmainwidget.cpp:2936
+#: kmmainwidget.cpp:2935
 msgid "Mark Thread as &Read"
 msgstr "Mark Thread as &Read"
 
-#: kmmainwidget.cpp:2937
+#: kmmainwidget.cpp:2936
 msgid "Mark all messages in the selected thread as read"
 msgstr "Mark all messages in the selected thread as read"
 
-#: kmmainwidget.cpp:2942
+#: kmmainwidget.cpp:2941
 msgid "Mark Thread as &New"
 msgstr "Mark Thread as &New"
 
-#: kmmainwidget.cpp:2943
+#: kmmainwidget.cpp:2942
 msgid "Mark all messages in the selected thread as new"
 msgstr "Mark all messages in the selected thread as new"
 
-#: kmmainwidget.cpp:2948
+#: kmmainwidget.cpp:2947
 msgid "Mark Thread as &Unread"
 msgstr "Mark Thread as &Unread"
 
-#: kmmainwidget.cpp:2949
+#: kmmainwidget.cpp:2948
 msgid "Mark all messages in the selected thread as unread"
 msgstr "Mark all messages in the selected thread as unread"
 
-#: kmmainwidget.cpp:2957
+#: kmmainwidget.cpp:2956
 msgid "Mark Thread as &Important"
 msgstr "Mark Thread as &Important"
 
-#: kmmainwidget.cpp:2960
+#: kmmainwidget.cpp:2959
 msgid "Remove &Important Thread Mark"
 msgstr "Remove &Important Thread Mark"
 
-#: kmmainwidget.cpp:2963
+#: kmmainwidget.cpp:2962
 #, fuzzy
 msgid "Mark Thread as &Action Item"
 msgstr "Mark Thread as &New"
 
-#: kmmainwidget.cpp:2966
+#: kmmainwidget.cpp:2965
 #, fuzzy
 msgid "Remove &Action Item Thread Mark"
 msgstr "Remove &Important Thread Mark"
 
-#: kmmainwidget.cpp:2970
+#: kmmainwidget.cpp:2969
 msgid "&Watch Thread"
 msgstr "&Watch Thread"
 
-#: kmmainwidget.cpp:2974
+#: kmmainwidget.cpp:2973
 msgid "&Ignore Thread"
 msgstr "&Ignore Thread"
 
-#: kmmainwidget.cpp:2982
+#: kmmainwidget.cpp:2981
 msgid "Save A&ttachments..."
 msgstr "Save A&ttachments..."
 
-#: kmmainwidget.cpp:2992
+#: kmmainwidget.cpp:2991
 msgid "Appl&y All Filters"
 msgstr "Appl&y All Filters"
 
-#: kmail_part.rc:142 kmmainwidget.cpp:2997 kmmainwin.rc:145
+#: kmail_part.rc:142 kmmainwidget.cpp:2996 kmmainwin.rc:145
 #, no-c-format
 msgid "A&pply Filter"
 msgstr "A&pply Filter"
 
-#: kmmainwidget.cpp:3004
+#: kmmainwidget.cpp:3003
 msgid ""
 "_: View->\n"
 "&Unread Count"
 msgstr "&Unread Count"
 
-#: kmmainwidget.cpp:3006
+#: kmmainwidget.cpp:3005
 msgid "Choose how to display the count of unread messages"
 msgstr "Choose how to display the count of unread messages"
 
-#: kmmainwidget.cpp:3008
+#: kmmainwidget.cpp:3007
 msgid ""
 "_: View->Unread Count\n"
 "View in &Separate Column"
 msgstr "View in &Separate Column"
 
-#: kmmainwidget.cpp:3014
+#: kmmainwidget.cpp:3013
 msgid ""
 "_: View->Unread Count\n"
 "View After &Folder Name"
 msgstr "View After &Folder Name"
 
-#: kmmainwidget.cpp:3021
+#: kmmainwidget.cpp:3020
 msgid ""
 "_: View->\n"
 "&Total Column"
 msgstr "&Total Column"
 
-#: kmmainwidget.cpp:3024
+#: kmmainwidget.cpp:3023
 msgid ""
 "Toggle display of column showing the total number of messages in folders."
 msgstr ""
 "Toggle display of column showing the total number of messages in folders."
 
-#: kmmainwidget.cpp:3026
+#: kmmainwidget.cpp:3025
 #, fuzzy
 msgid ""
 "_: View->\n"
 "&Size Column"
 msgstr "&Total Column"
 
-#: kmmainwidget.cpp:3029
+#: kmmainwidget.cpp:3028
 #, fuzzy
 msgid "Toggle display of column showing the total size of messages in folders."
 msgstr ""
 "Toggle display of column showing the total number of messages in folders."
 
-#: kmmainwidget.cpp:3032
+#: kmmainwidget.cpp:3031
 msgid ""
 "_: View->\n"
 "&Expand Thread"
 msgstr "&Expand Thread"
 
-#: kmmainwidget.cpp:3033
+#: kmmainwidget.cpp:3032
 msgid "Expand the current thread"
 msgstr "Expand the current thread"
 
-#: kmmainwidget.cpp:3038
+#: kmmainwidget.cpp:3037
 msgid ""
 "_: View->\n"
 "&Collapse Thread"
 msgstr "&Collapse Thread"
 
-#: kmmainwidget.cpp:3039
+#: kmmainwidget.cpp:3038
 msgid "Collapse the current thread"
 msgstr "Collapse the current thread"
 
-#: kmmainwidget.cpp:3044
+#: kmmainwidget.cpp:3043
 msgid ""
 "_: View->\n"
 "Ex&pand All Threads"
 msgstr "Ex&pand All Threads"
 
-#: kmmainwidget.cpp:3045
+#: kmmainwidget.cpp:3044
 msgid "Expand all threads in the current folder"
 msgstr "Expand all threads in the current folder"
 
-#: kmmainwidget.cpp:3050
+#: kmmainwidget.cpp:3049
 msgid ""
 "_: View->\n"
 "C&ollapse All Threads"
 msgstr "C&ollapse All Threads"
 
-#: kmmainwidget.cpp:3051
+#: kmmainwidget.cpp:3050
 msgid "Collapse all threads in the current folder"
 msgstr "Collapse all threads in the current folder"
 
-#: kmmainwidget.cpp:3056 kmreadermainwin.cpp:373
+#: kmmainwidget.cpp:3055 kmreadermainwin.cpp:373
 msgid "&View Source"
 msgstr "&View Source"
 
-#: kmmainwidget.cpp:3060
+#: kmmainwidget.cpp:3059
 msgid "&Display Message"
 msgstr "&Display Message"
 
-#: kmmainwidget.cpp:3066
+#: kmmainwidget.cpp:3065
 msgid "&Next Message"
 msgstr "&Next Message"
 
-#: kmmainwidget.cpp:3067
+#: kmmainwidget.cpp:3066
 msgid "Go to the next message"
 msgstr "Go to the next message"
 
-#: kmmainwidget.cpp:3071
+#: kmmainwidget.cpp:3070
 msgid "Next &Unread Message"
 msgstr "Next &Unread Message"
 
-#: kmmainwidget.cpp:3073
+#: kmmainwidget.cpp:3072
 msgid "Go to the next unread message"
 msgstr "Go to the next unread message"
 
-#: kmmainwidget.cpp:3084
+#: kmmainwidget.cpp:3083
 msgid "&Previous Message"
 msgstr "&Previous Message"
 
-#: kmmainwidget.cpp:3085
+#: kmmainwidget.cpp:3084
 msgid "Go to the previous message"
 msgstr "Go to the previous message"
 
-#: kmmainwidget.cpp:3089
+#: kmmainwidget.cpp:3088
 msgid "Previous Unread &Message"
 msgstr "Previous Unread &Message"
 
-#: kmmainwidget.cpp:3091
+#: kmmainwidget.cpp:3090
 msgid "Go to the previous unread message"
 msgstr "Go to the previous unread message"
 
-#: kmmainwidget.cpp:3103
+#: kmmainwidget.cpp:3102
 msgid "Next Unread &Folder"
 msgstr "Next Unread &Folder"
 
-#: kmmainwidget.cpp:3104
+#: kmmainwidget.cpp:3103
 msgid "Go to the next folder with unread messages"
 msgstr "Go to the next folder with unread messages"
 
-#: kmmainwidget.cpp:3112
+#: kmmainwidget.cpp:3111
 msgid "Previous Unread F&older"
 msgstr "Previous Unread F&older"
 
-#: kmmainwidget.cpp:3113
+#: kmmainwidget.cpp:3112
 msgid "Go to the previous folder with unread messages"
 msgstr "Go to the previous folder with unread messages"
 
-#: kmmainwidget.cpp:3120
+#: kmmainwidget.cpp:3119
 msgid ""
 "_: Go->\n"
 "Next Unread &Text"
 msgstr "Next Unread &Text"
 
-#: kmmainwidget.cpp:3121
+#: kmmainwidget.cpp:3120
 msgid "Go to the next unread text"
 msgstr "Go to the next unread text"
 
-#: kmmainwidget.cpp:3122
+#: kmmainwidget.cpp:3121
 msgid ""
 "Scroll down current message. If at end of current message, go to next unread "
 "message."
@@ -9190,55 +9190,55 @@ msgstr ""
 "Scroll down current message. If at end of current message, go to next unread "
 "message."
 
-#: kmmainwidget.cpp:3129
+#: kmmainwidget.cpp:3128
 msgid "Show Quick Search"
 msgstr "Show Quick Search"
 
-#: kmmainwidget.cpp:3136
+#: kmmainwidget.cpp:3135
 msgid "Configure &Filters..."
 msgstr "Configure &Filters..."
 
-#: kmmainwidget.cpp:3138
+#: kmmainwidget.cpp:3137
 msgid "Configure &POP Filters..."
 msgstr "Configure &POP Filters..."
 
-#: kmmainwidget.cpp:3140
+#: kmmainwidget.cpp:3139
 msgid "Manage &Sieve Scripts..."
 msgstr "Manage &Sieve Scripts..."
 
-#: kmmainwidget.cpp:3143
+#: kmmainwidget.cpp:3142
 msgid "KMail &Introduction"
 msgstr "KMail &Introduction"
 
-#: kmmainwidget.cpp:3144
+#: kmmainwidget.cpp:3143
 msgid "Display KMail's Welcome Page"
 msgstr "Display KMail's Welcome Page"
 
-#: kmmainwidget.cpp:3150
+#: kmmainwidget.cpp:3149
 msgid "Configure &Notifications..."
 msgstr "Configure &Notifications..."
 
-#: kmmainwidget.cpp:3155
+#: kmmainwidget.cpp:3154
 msgid "&Configure KMail..."
 msgstr "&Configure KMail..."
 
-#: kmmainwidget.cpp:3454
+#: kmmainwidget.cpp:3453
 msgid "E&mpty Trash"
 msgstr "E&mpty Wastebin"
 
-#: kmmainwidget.cpp:3455
+#: kmmainwidget.cpp:3454
 msgid "&Move All Messages to Trash"
 msgstr "&Move All Messages to the Wastebin"
 
-#: kmmainwidget.cpp:3464
+#: kmmainwidget.cpp:3463
 msgid "&Delete Search"
 msgstr "&Delete Search"
 
-#: kmmainwidget.cpp:3465
+#: kmmainwidget.cpp:3464
 msgid "&Delete Folder"
 msgstr "&Delete Folder"
 
-#: kmmainwidget.cpp:3649
+#: kmmainwidget.cpp:3648
 #, c-format
 msgid ""
 "_n: Removed %n duplicate message.\n"
@@ -9247,25 +9247,25 @@ msgstr ""
 "Removed %n duplicate message.\n"
 "Removed %n duplicate messages."
 
-#: kmmainwidget.cpp:3651
+#: kmmainwidget.cpp:3650
 msgid "No duplicate messages found."
 msgstr "No duplicate messages found."
 
-#: kmmainwidget.cpp:3721
+#: kmmainwidget.cpp:3720
 #, c-format
 msgid "Filter %1"
 msgstr "Filter %1"
 
-#: kmmainwidget.cpp:3855
+#: kmmainwidget.cpp:3854
 msgid "Subscription"
 msgstr "Subscription"
 
-#: kmmainwidget.cpp:3872
+#: kmmainwidget.cpp:3871
 #, fuzzy
 msgid "Local Subscription"
 msgstr "Subscription"
 
-#: kmmainwidget.cpp:4007
+#: kmmainwidget.cpp:4006
 #, fuzzy
 msgid "Out of office reply active"
 msgstr "Edit \"Out of Office\" Replies..."
@@ -9278,7 +9278,7 @@ msgstr "New &Window"
 msgid " Initializing..."
 msgstr " Initialising..."
 
-#: kmmessage.cpp:1336
+#: kmmessage.cpp:1335
 msgid ""
 "This message contains a request to return a notification about your "
 "reception of the message.\n"
@@ -9290,7 +9290,7 @@ msgstr ""
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 
-#: kmmessage.cpp:1341
+#: kmmessage.cpp:1340
 msgid ""
 "This message contains a request to send a notification about your reception "
 "of the message.\n"
@@ -9304,7 +9304,7 @@ msgstr ""
 "which is unknown to KMail.\n"
 "You can either ignore the request or let KMail send a \"failed\" response."
 
-#: kmmessage.cpp:1348
+#: kmmessage.cpp:1347
 msgid ""
 "This message contains a request to send a notification about your reception "
 "of the message,\n"
@@ -9318,7 +9318,7 @@ msgstr ""
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 
-#: kmmessage.cpp:1355
+#: kmmessage.cpp:1354
 msgid ""
 "This message contains a request to send a notification about your reception "
 "of the message,\n"
@@ -9332,7 +9332,7 @@ msgstr ""
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 
-#: kmmessage.cpp:1361
+#: kmmessage.cpp:1360
 msgid ""
 "This message contains a request to send a notification about your reception "
 "of the message,\n"
@@ -9348,19 +9348,19 @@ msgstr ""
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 
-#: kmmessage.cpp:1379 kmmessage.cpp:1386
+#: kmmessage.cpp:1378 kmmessage.cpp:1385
 msgid "Message Disposition Notification Request"
 msgstr "Message Disposition Notification Request"
 
-#: kmmessage.cpp:1381
+#: kmmessage.cpp:1380
 msgid "Send \"&denied\""
 msgstr "Send \"&denied\""
 
-#: kmmessage.cpp:1381 kmmessage.cpp:1388
+#: kmmessage.cpp:1380 kmmessage.cpp:1387
 msgid "&Send"
 msgstr "&Send"
 
-#: kmmessage.cpp:1458
+#: kmmessage.cpp:1457
 msgid ""
 "Header \"Disposition-Notification-Options\" contained required, but unknown "
 "parameter"
@@ -9368,25 +9368,25 @@ msgstr ""
 "Header \"Disposition-Notification-Options\" contained required, but unknown "
 "parameter"
 
-#: kmmessage.cpp:1650
+#: kmmessage.cpp:1649
 msgid "Receipt: "
 msgstr "Receipt: "
 
-#: kmmessage.cpp:3171 urlhandlermanager.cpp:692
+#: kmmessage.cpp:3170 urlhandlermanager.cpp:692
 #, c-format
 msgid "Attachment: %1"
 msgstr "Attachment: %1"
 
-#: kmmessage.cpp:3202
+#: kmmessage.cpp:3201
 #, fuzzy
 msgid "This attachment has been deleted."
 msgstr "Show attachments as suggested by sender."
 
-#: kmmessage.cpp:3204
+#: kmmessage.cpp:3203
 msgid "The attachment '%1' has been deleted."
 msgstr ""
 
-#: kmmimeparttree.cpp:137 kmreaderwin.cpp:2037
+#: kmmimeparttree.cpp:137 kmreaderwin.cpp:2036
 msgid ""
 "_: to view something\n"
 "View"
@@ -9396,12 +9396,12 @@ msgstr "View"
 msgid "Save All Attachments..."
 msgstr "Save All Attachments..."
 
-#: kmmimeparttree.cpp:152 kmreaderwin.cpp:2044 kmreaderwin.cpp:2808
+#: kmmimeparttree.cpp:152 kmreaderwin.cpp:2043 kmreaderwin.cpp:2807
 #, fuzzy
 msgid "Delete Attachment"
 msgstr "&Remove Attachment"
 
-#: kmmimeparttree.cpp:155 kmreaderwin.cpp:2042 kmreaderwin.cpp:2864
+#: kmmimeparttree.cpp:155 kmreaderwin.cpp:2041 kmreaderwin.cpp:2863
 #, fuzzy
 msgid "Edit Attachment"
 msgstr "Attachment"
@@ -9601,222 +9601,222 @@ msgstr "unknown"
 msgid "Save Attachments..."
 msgstr "Save Attachments..."
 
-#: kmreaderwin.cpp:489
+#: kmreaderwin.cpp:488
 msgid ""
 "_: View->\n"
 "&Headers"
 msgstr "&Headers"
 
-#: kmreaderwin.cpp:490
+#: kmreaderwin.cpp:489
 msgid "Choose display style of message headers"
 msgstr "Choose display style of message headers"
 
-#: kmreaderwin.cpp:495
+#: kmreaderwin.cpp:494
 #, fuzzy
 msgid ""
 "_: View->headers->\n"
 "&Enterprise Headers"
 msgstr "&Brief Headers"
 
-#: kmreaderwin.cpp:498
+#: kmreaderwin.cpp:497
 #, fuzzy
 msgid "Show the list of headers in Enterprise style"
 msgstr "Show the list of headers in a fancy format"
 
-#: kmreaderwin.cpp:502
+#: kmreaderwin.cpp:501
 msgid ""
 "_: View->headers->\n"
 "&Fancy Headers"
 msgstr "&Fancy Headers"
 
-#: kmreaderwin.cpp:505
+#: kmreaderwin.cpp:504
 msgid "Show the list of headers in a fancy format"
 msgstr "Show the list of headers in a fancy format"
 
-#: kmreaderwin.cpp:509
+#: kmreaderwin.cpp:508
 msgid ""
 "_: View->headers->\n"
 "&Brief Headers"
 msgstr "&Brief Headers"
 
-#: kmreaderwin.cpp:512
+#: kmreaderwin.cpp:511
 msgid "Show brief list of message headers"
 msgstr "Show brief list of message headers"
 
-#: kmreaderwin.cpp:516
+#: kmreaderwin.cpp:515
 msgid ""
 "_: View->headers->\n"
 "&Standard Headers"
 msgstr "&Standard Headers"
 
-#: kmreaderwin.cpp:519
+#: kmreaderwin.cpp:518
 msgid "Show standard list of message headers"
 msgstr "Show standard list of message headers"
 
-#: kmreaderwin.cpp:523
+#: kmreaderwin.cpp:522
 msgid ""
 "_: View->headers->\n"
 "&Long Headers"
 msgstr "&Long Headers"
 
-#: kmreaderwin.cpp:526
+#: kmreaderwin.cpp:525
 msgid "Show long list of message headers"
 msgstr "Show long list of message headers"
 
-#: kmreaderwin.cpp:530
+#: kmreaderwin.cpp:529
 msgid ""
 "_: View->headers->\n"
 "&All Headers"
 msgstr "&All Headers"
 
-#: kmreaderwin.cpp:533
+#: kmreaderwin.cpp:532
 msgid "Show all message headers"
 msgstr "Show all message headers"
 
-#: kmreaderwin.cpp:539
+#: kmreaderwin.cpp:538
 msgid ""
 "_: View->\n"
 "&Attachments"
 msgstr "&Attachments"
 
-#: kmreaderwin.cpp:540
+#: kmreaderwin.cpp:539
 msgid "Choose display style of attachments"
 msgstr "Choose display style of attachments"
 
-#: kmreaderwin.cpp:544
+#: kmreaderwin.cpp:543
 msgid ""
 "_: View->attachments->\n"
 "&As Icons"
 msgstr "&As Icons"
 
-#: kmreaderwin.cpp:547
+#: kmreaderwin.cpp:546
 msgid "Show all attachments as icons. Click to see them."
 msgstr "Show all attachments as icons. Click to see them."
 
-#: kmreaderwin.cpp:551
+#: kmreaderwin.cpp:550
 msgid ""
 "_: View->attachments->\n"
 "&Smart"
 msgstr "&Smart"
 
-#: kmreaderwin.cpp:554
+#: kmreaderwin.cpp:553
 msgid "Show attachments as suggested by sender."
 msgstr "Show attachments as suggested by sender."
 
-#: kmreaderwin.cpp:558
+#: kmreaderwin.cpp:557
 msgid ""
 "_: View->attachments->\n"
 "&Inline"
 msgstr "&Inline"
 
-#: kmreaderwin.cpp:561
+#: kmreaderwin.cpp:560
 msgid "Show all attachments inline (if possible)"
 msgstr "Show all attachments inline (if possible)"
 
-#: kmreaderwin.cpp:565
+#: kmreaderwin.cpp:564
 msgid ""
 "_: View->attachments->\n"
 "&Hide"
 msgstr "&Hide"
 
-#: kmreaderwin.cpp:568
+#: kmreaderwin.cpp:567
 msgid "Do not show attachments in the message viewer"
 msgstr "Do not show attachments in the message viewer"
 
-#: kmreaderwin.cpp:572
+#: kmreaderwin.cpp:571
 #, fuzzy
 msgid ""
 "_: View->attachments->\n"
 "In Header &Only"
 msgstr "&Hide"
 
-#: kmreaderwin.cpp:575
+#: kmreaderwin.cpp:574
 #, fuzzy
 msgid "Show Attachments only in the header of the mail"
 msgstr "Show all attachments as icons. Click to see them."
 
-#: kmreaderwin.cpp:580
+#: kmreaderwin.cpp:579
 msgid "&Set Encoding"
 msgstr "&Set Encoding"
 
-#: kmreaderwin.cpp:588
+#: kmreaderwin.cpp:587
 msgid "New Message To..."
 msgstr "New Message To..."
 
-#: kmreaderwin.cpp:591
+#: kmreaderwin.cpp:590
 msgid "Reply To..."
 msgstr "Reply To..."
 
-#: kmreaderwin.cpp:594
+#: kmreaderwin.cpp:593
 msgid "Forward To..."
 msgstr "Forward To..."
 
-#: kmreaderwin.cpp:597
+#: kmreaderwin.cpp:596
 msgid "Add to Address Book"
 msgstr "Add to Address Book"
 
-#: kmreaderwin.cpp:600
+#: kmreaderwin.cpp:599
 msgid "Open in Address Book"
 msgstr "Open in Address Book"
 
-#: kmreaderwin.cpp:604
+#: kmreaderwin.cpp:603
 msgid "Select All Text"
 msgstr "Select All Text"
 
-#: kmreaderwin.cpp:606 kmreaderwin.cpp:1997
+#: kmreaderwin.cpp:605 kmreaderwin.cpp:1996
 msgid "Copy Link Address"
 msgstr "Copy Link Address"
 
-#: kmreaderwin.cpp:608
+#: kmreaderwin.cpp:607
 msgid "Open URL"
 msgstr "Open URL"
 
-#: kmreaderwin.cpp:610
+#: kmreaderwin.cpp:609
 msgid "Bookmark This Link"
 msgstr "Bookmark This Link"
 
-#: kmreaderwin.cpp:614
+#: kmreaderwin.cpp:613
 msgid "Save Link As..."
 msgstr "Save Link As..."
 
-#: kmreaderwin.cpp:621
+#: kmreaderwin.cpp:620
 msgid "Chat &With..."
 msgstr "Chat &With..."
 
-#: kmreaderwin.cpp:1261
+#: kmreaderwin.cpp:1260
 msgid "Full namespace support for IMAP"
 msgstr "Full namespace support for IMAP"
 
-#: kmreaderwin.cpp:1262
+#: kmreaderwin.cpp:1261
 msgid "Offline mode"
 msgstr "Offline mode"
 
-#: kmreaderwin.cpp:1263
+#: kmreaderwin.cpp:1262
 msgid "Sieve script management and editing"
 msgstr "Sieve script management and editing"
 
-#: kmreaderwin.cpp:1264
+#: kmreaderwin.cpp:1263
 msgid "Account specific filtering"
 msgstr "Account specific filtering"
 
-#: kmreaderwin.cpp:1265
+#: kmreaderwin.cpp:1264
 msgid "Filtering of incoming mail for online IMAP accounts"
 msgstr "Filtering of incoming mail for online IMAP accounts"
 
-#: kmreaderwin.cpp:1266
+#: kmreaderwin.cpp:1265
 msgid "Online IMAP folders can be used when filtering into folders"
 msgstr "Online IMAP folders can be used when filtering into folders"
 
-#: kmreaderwin.cpp:1267
+#: kmreaderwin.cpp:1266
 msgid "Automatically delete older mails on POP servers"
 msgstr "Automatically delete older mails on POP servers"
 
-#: kmreaderwin.cpp:1305
+#: kmreaderwin.cpp:1304
 #, fuzzy
 msgid "The email client for the Trinity Desktop Environment."
 msgstr "The email client for the K Desktop Environment."
 
-#: kmreaderwin.cpp:1313
+#: kmreaderwin.cpp:1312
 msgid ""
 "<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2><p>Please "
 "wait . . .</p>&nbsp;"
@@ -9824,7 +9824,7 @@ msgstr ""
 "<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2><p>Please "
 "wait . . .</p>&nbsp;"
 
-#: kmreaderwin.cpp:1321
+#: kmreaderwin.cpp:1320
 msgid ""
 "<h2 style='margin-top: 0px;'>Offline</h2><p>KMail is currently in offline "
 "mode. Click <a href=\"kmail:goOnline\">here</a> to go online . . .</p>&nbsp;"
@@ -9832,7 +9832,7 @@ msgstr ""
 "<h2 style='margin-top: 0px;'>Offline</h2><p>KMail is currently in offline "
 "mode. Click <a href=\"kmail:goOnline\">here</a> to go online . . .</p>&nbsp;"
 
-#: kmreaderwin.cpp:1338
+#: kmreaderwin.cpp:1337
 #, fuzzy
 msgid ""
 "_: %1: KMail version; %2: help:// URL; %3: homepage URL; %4: prior KMail "
@@ -9874,11 +9874,11 @@ msgstr ""
 "<p>Thank you,</p>\n"
 "<p style='margin-bottom: 0px'>&nbsp; &nbsp; The KMail Team</p>"
 
-#: kmreaderwin.cpp:1361 kmreaderwin.cpp:1383
+#: kmreaderwin.cpp:1360 kmreaderwin.cpp:1382
 msgid "<li>%1</li>\n"
 msgstr "<li>%1</li>\n"
 
-#: kmreaderwin.cpp:1366
+#: kmreaderwin.cpp:1365
 msgid ""
 "<p>Please take a moment to fill in the KMail configuration panel at Settings-"
 "&gt;Configure KMail.\n"
@@ -9890,7 +9890,7 @@ msgstr ""
 "You need to create at least a default identity and an incoming as well as "
 "outgoing mail account.</p>\n"
 
-#: kmreaderwin.cpp:1378
+#: kmreaderwin.cpp:1377
 msgid ""
 "<p><span style='font-size:125%; font-weight:bold;'>Important changes</span> "
 "(compared to KMail %1):</p>\n"
@@ -9898,33 +9898,33 @@ msgstr ""
 "<p><span style='font-size:125%; font-weight:bold;'>Important changes</span> "
 "(compared to KMail %1):</p>\n"
 
-#: kmreaderwin.cpp:1521
+#: kmreaderwin.cpp:1520
 msgid "( body part )"
 msgstr "( body part )"
 
-#: kmreaderwin.cpp:1893
+#: kmreaderwin.cpp:1892
 msgid "Could not send MDN."
 msgstr "Could not send MDN."
 
-#: kmreaderwin.cpp:1995
+#: kmreaderwin.cpp:1994
 #, fuzzy
 msgid "Copy Email Address"
 msgstr "Email Address"
 
-#: kmreaderwin.cpp:2047
+#: kmreaderwin.cpp:2046
 msgid "Decrypt With Chiasmus..."
 msgstr "Decrypt With Chiasmus..."
 
-#: kmreaderwin.cpp:2053
+#: kmreaderwin.cpp:2052
 msgid "Scroll To"
 msgstr ""
 
-#: kmreaderwin.cpp:2211 kmreaderwin.cpp:2247 kmreaderwin.cpp:2267
+#: kmreaderwin.cpp:2210 kmreaderwin.cpp:2246 kmreaderwin.cpp:2266
 #, c-format
 msgid "View Attachment: %1"
 msgstr "View Attachment: %1"
 
-#: kmreaderwin.cpp:2260
+#: kmreaderwin.cpp:2259
 #, c-format
 msgid ""
 "_n: [KMail: Attachment contains binary data. Trying to show first "
@@ -9934,15 +9934,15 @@ msgstr ""
 "[KMail: Attachment contains binary data. Trying to show first character.]\n"
 "[KMail: Attachment contains binary data. Trying to show first %n characters.]"
 
-#: kmreaderwin.cpp:2356
+#: kmreaderwin.cpp:2355
 msgid "&Open with '%1'"
 msgstr "&Open with '%1'"
 
-#: kmreaderwin.cpp:2358
+#: kmreaderwin.cpp:2357
 msgid "&Open With..."
 msgstr "&Open With..."
 
-#: kmreaderwin.cpp:2360
+#: kmreaderwin.cpp:2359
 msgid ""
 "Open attachment '%1'?\n"
 "Note that opening an attachment may compromise your system's security."
@@ -9950,160 +9950,160 @@ msgstr ""
 "Open attachment '%1'?\n"
 "Note that opening an attachment may compromise your system's security."
 
-#: kmreaderwin.cpp:2365
+#: kmreaderwin.cpp:2364
 msgid "Open Attachment?"
 msgstr "Open Attachment?"
 
-#: kmreaderwin.cpp:2807
+#: kmreaderwin.cpp:2806
 msgid ""
 "Deleting an attachment might invalidate any digital signature on this "
 "message."
 msgstr ""
 
-#: kmreaderwin.cpp:2863
+#: kmreaderwin.cpp:2862
 msgid ""
 "Modifying an attachment might invalidate any digital signature on this "
 "message."
 msgstr ""
 
-#: kmreaderwin.cpp:2959
+#: kmreaderwin.cpp:2958
 #, fuzzy
 msgid "Attachments:"
 msgstr "Attachment"
 
-#: kmsearchpattern.cpp:913
+#: kmsearchpattern.cpp:912
 msgid ""
 "_: name used for a virgin filter\n"
 "unknown"
 msgstr "unknown"
 
-#: kmsearchpattern.cpp:919
+#: kmsearchpattern.cpp:918
 msgid "(match any of the following)"
 msgstr "(match any of the following)"
 
-#: kmsearchpattern.cpp:921
+#: kmsearchpattern.cpp:920
 msgid "(match all of the following)"
 msgstr "(match all of the following)"
 
-#: kmsearchpattern.h:221
+#: kmsearchpattern.h:220
 msgid "Read"
 msgstr "Read"
 
-#: kmsearchpattern.h:222
+#: kmsearchpattern.h:221
 msgid "Old"
 msgstr "Old"
 
-#: kmsearchpattern.h:223
+#: kmsearchpattern.h:222
 msgid "Deleted"
 msgstr "Deleted"
 
-#: kmsearchpattern.h:224
+#: kmsearchpattern.h:223
 msgid "Replied"
 msgstr "Replied"
 
-#: kmsearchpattern.h:225
+#: kmsearchpattern.h:224
 msgid "Forwarded"
 msgstr "Forwarded"
 
-#: kmsearchpattern.h:226
+#: kmsearchpattern.h:225
 msgid "Queued"
 msgstr "Queued"
 
-#: kmsearchpattern.h:227
+#: kmsearchpattern.h:226
 msgid "Sent"
 msgstr "Sent"
 
-#: kmsearchpattern.h:228
+#: kmsearchpattern.h:227
 msgid "Watched"
 msgstr "Watched"
 
-#: kmsearchpattern.h:229
+#: kmsearchpattern.h:228
 msgid "Ignored"
 msgstr "Ignored"
 
-#: kmsearchpattern.h:230
+#: kmsearchpattern.h:229
 msgid "Spam"
 msgstr "Spam"
 
-#: kmsearchpattern.h:231
+#: kmsearchpattern.h:230
 msgid "Ham"
 msgstr "Ham"
 
-#: kmsearchpattern.h:232
+#: kmsearchpattern.h:231
 msgid "To Do"
 msgstr "To-do"
 
-#: kmsearchpattern.h:234
+#: kmsearchpattern.h:233
 msgid "Has Attachment"
 msgstr "Has Attachment"
 
-#: kmsearchpatternedit.cpp:34
+#: kmsearchpatternedit.cpp:33
 #, fuzzy
 msgid "Complete Message"
 msgstr "Delete Message"
 
-#: kmsearchpatternedit.cpp:35
+#: kmsearchpatternedit.cpp:34
 #, fuzzy
 msgid "Body of Message"
 msgstr "Todo Message"
 
-#: kmsearchpatternedit.cpp:36
+#: kmsearchpatternedit.cpp:35
 #, fuzzy
 msgid "Anywhere in Headers"
 msgstr "Rewrite Header"
 
-#: kmsearchpatternedit.cpp:37
+#: kmsearchpatternedit.cpp:36
 #, fuzzy
 msgid "All Recipients"
 msgstr "Additional Recipients"
 
-#: kmsearchpatternedit.cpp:38
+#: kmsearchpatternedit.cpp:37
 #, fuzzy
 msgid "Size in Bytes"
 msgstr "<size in bytes>"
 
-#: kmsearchpatternedit.cpp:39
+#: kmsearchpatternedit.cpp:38
 #, fuzzy
 msgid "Age in Days"
 msgstr "<age in days>"
 
-#: kmsearchpatternedit.cpp:40
+#: kmsearchpatternedit.cpp:39
 #, fuzzy
 msgid "Message Status"
 msgstr "Message List"
 
-#: kmsearchpatternedit.cpp:42
+#: kmsearchpatternedit.cpp:41
 #, fuzzy
 msgid "From"
 msgstr "&From"
 
-#: kmsearchpatternedit.cpp:43 recipientseditor.cpp:100
+#: kmsearchpatternedit.cpp:42 recipientseditor.cpp:100
 msgid "To"
 msgstr "To"
 
-#: kmsearchpatternedit.cpp:44 recipientseditor.cpp:102
+#: kmsearchpatternedit.cpp:43 recipientseditor.cpp:102
 msgid "CC"
 msgstr "CC"
 
-#: kmsearchpatternedit.cpp:45
+#: kmsearchpatternedit.cpp:44
 #, fuzzy
 msgid "Reply To"
 msgstr "&Reply To"
 
-#: kmsearchpatternedit.cpp:46
+#: kmsearchpatternedit.cpp:45
 #, fuzzy
 msgid "Organization"
 msgstr "Organisation:"
 
-#: kmsearchpatternedit.cpp:397
+#: kmsearchpatternedit.cpp:396
 msgid "Search Criteria"
 msgstr "Search Criteria"
 
-#: kmsearchpatternedit.cpp:414
+#: kmsearchpatternedit.cpp:413
 msgid "Match a&ll of the following"
 msgstr "Match a&ll of the following"
 
-#: kmsearchpatternedit.cpp:415
+#: kmsearchpatternedit.cpp:414
 msgid "Match an&y of the following"
 msgstr "Match an&y of the following"
 
@@ -10336,15 +10336,15 @@ msgstr "Start %1"
 msgid "Exit"
 msgstr "Exit"
 
-#: kmsystemtray.cpp:357
+#: kmsystemtray.cpp:356
 msgid "New Messages In"
 msgstr "New Messages In"
 
-#: kmsystemtray.cpp:567
+#: kmsystemtray.cpp:566
 msgid "There are no unread messages"
 msgstr "There are no unread messages"
 
-#: kmsystemtray.cpp:569
+#: kmsystemtray.cpp:568
 #, c-format
 msgid ""
 "_n: There is 1 unread message.\n"
@@ -13363,36 +13363,36 @@ msgid ""
 "set here."
 msgstr ""
 
-#: kmail.kcfg:93
+#: kmail.kcfg:92
 #, no-c-format
 msgid "The most recently selected folder in the folder selection dialog."
 msgstr "The most recently selected folder in the folder selection dialogue."
 
-#: kmail.kcfg:101
+#: kmail.kcfg:100
 #, no-c-format
 msgid ""
 "Disregard the users umask setting and use \"read-write for the user only\" "
 "instead"
 msgstr ""
 
-#: kmail.kcfg:109
+#: kmail.kcfg:108
 #, no-c-format
 msgid "Policy for showing the system tray icon"
 msgstr "Policy for showing the system tray icon"
 
-#: kmail.kcfg:117
+#: kmail.kcfg:116
 #, no-c-format
 msgid ""
 "Close the application when the mainwindow is closed, even if there is a "
 "system tray icon active."
 msgstr ""
 
-#: kmail.kcfg:121
+#: kmail.kcfg:120
 #, no-c-format
 msgid "Verbose new mail notification"
 msgstr "Verbose new mail notification"
 
-#: kmail.kcfg:122
+#: kmail.kcfg:121
 #, no-c-format
 msgid ""
 "If this option is enabled then for each folder the number of newly arrived "
@@ -13403,34 +13403,34 @@ msgstr ""
 "messages is shown in the new mail notification; otherwise, you will only get "
 "a simple 'New mail arrived' message."
 
-#: kmail.kcfg:126
+#: kmail.kcfg:125
 #, no-c-format
 msgid "Specify e&ditor:"
 msgstr "Specify e&ditor:"
 
-#: kmail.kcfg:130
+#: kmail.kcfg:129
 #, no-c-format
 msgid "Use e&xternal editor instead of composer"
 msgstr "Use e&xternal editor instead of composer"
 
-#: kmail.kcfg:157
+#: kmail.kcfg:156
 #, no-c-format
 msgid ""
 "The threshold for when to warn the user that a folder is nearing its quota "
 "limit."
 msgstr ""
 
-#: kmail.kcfg:166
+#: kmail.kcfg:165
 #, no-c-format
 msgid "Enable groupware functionality"
 msgstr "Enable groupware functionality"
 
-#: kmail.kcfg:172
+#: kmail.kcfg:171
 #, no-c-format
 msgid "Mangle From:/To: headers in replies to replies"
 msgstr "Mangle From:/To: headers in replies to replies"
 
-#: kmail.kcfg:173
+#: kmail.kcfg:172
 #, no-c-format
 msgid ""
 "Microsoft Outlook has a number of shortcomings in its implementation of the "
@@ -13443,12 +13443,12 @@ msgstr ""
 "problems with Outlook users not being able to get your replies, try setting "
 "this option."
 
-#: kmail.kcfg:178
+#: kmail.kcfg:177
 #, no-c-format
 msgid "Send groupware invitations in the mail body"
 msgstr "Send groupware invitations in the mail body"
 
-#: kmail.kcfg:179
+#: kmail.kcfg:178
 #, no-c-format
 msgid ""
 "Microsoft Outlook has a number of shortcomings  in its implementation of the "
@@ -13461,12 +13461,12 @@ msgstr ""
 "problems with Outlook users not being able to get your invitations, try "
 "setting this option."
 
-#: kmail.kcfg:184
+#: kmail.kcfg:183
 #, fuzzy, no-c-format
 msgid "Exchange compatible invitations naming"
 msgstr "Automatic invitation sending"
 
-#: kmail.kcfg:185
+#: kmail.kcfg:184
 #, no-c-format
 msgid ""
 "Microsoft Outlook, when used in combination with a Microsoft Exchange "
@@ -13475,14 +13475,14 @@ msgid ""
 "Exchange understands."
 msgstr ""
 
-#: kmail.kcfg:191
+#: kmail.kcfg:190
 #, no-c-format
 msgid ""
 "When replying to invitations, send the reply comment in way that Microsoft "
 "Outlook understands."
 msgstr ""
 
-#: kmail.kcfg:197
+#: kmail.kcfg:196
 #, no-c-format
 msgid ""
 "When this is checked, you will not see the mail composer window. Instead, "
@@ -13497,33 +13497,33 @@ msgstr ""
 "the composer window is in iCalendar syntax, and you should not try modifying "
 "it by hand."
 
-#: kmail.kcfg:213
+#: kmail.kcfg:212
 #, no-c-format
 msgid "Delete invitation emails after the reply to them has been sent"
 msgstr ""
 
-#: kmail.kcfg:214
+#: kmail.kcfg:213
 #, no-c-format
 msgid ""
 "When this is checked, received invitation emails that have been replied to "
 "will be moved to the Trash folder, once the reply has been successfully sent."
 msgstr ""
 
-#: kmail.kcfg:219
+#: kmail.kcfg:218
 #, no-c-format
 msgid ""
 "When encountering a Toltec scheduling message, display a custom replacement "
 "text for it."
 msgstr ""
 
-#: kmail.kcfg:224
+#: kmail.kcfg:223
 #, no-c-format
 msgid ""
 "The text that will be displayed as a replacement when encountering Toltec "
 "scheduling messages."
 msgstr ""
 
-#: kmail.kcfg:233
+#: kmail.kcfg:232
 #, no-c-format
 msgid ""
 "<p>Enabling this makes it possible to store the entries from the Kontact "
@@ -13536,7 +13536,7 @@ msgstr ""
 "this option you must also set the applications to use the IMAP resource; "
 "this is done in the TDE Control Centre.</p>"
 
-#: kmail.kcfg:238
+#: kmail.kcfg:237
 #, no-c-format
 msgid ""
 "<p>Usually you will not have any reason to see the folders that hold the "
@@ -13545,7 +13545,7 @@ msgstr ""
 "<p>Usually you will not have any reason to see the folders that hold the "
 "IMAP resources. But if you need to see them, you can set that here.</p>"
 
-#: kmail.kcfg:244
+#: kmail.kcfg:243
 #, no-c-format
 msgid ""
 "<p>If the account used for storing groupware information is not used to "
@@ -13554,7 +13554,7 @@ msgid ""
 "additional online IMAP account.</p>"
 msgstr ""
 
-#: kmail.kcfg:251
+#: kmail.kcfg:247
 #, no-c-format
 msgid ""
 "<p>Choose the storage format of the groupware folders. <ul><li>The default "
@@ -13571,7 +13571,7 @@ msgstr ""
 "the one used in Outlook. This format gives better Outlook compatibility, "
 "when using a Kolab server or a compatible solution.</li></ul></p>"
 
-#: kmail.kcfg:260
+#: kmail.kcfg:256
 #, no-c-format
 msgid ""
 "<p>This chooses the parent of the IMAP resource folders.</p><p>By default, "
@@ -13580,13 +13580,13 @@ msgstr ""
 "<p>This chooses the parent of the IMAP resource folders.</p><p>By default, "
 "the Kolab server sets the IMAP inbox to be the parent.</p>"
 
-#: kmail.kcfg:265
+#: kmail.kcfg:261
 #, no-c-format
 msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
 msgstr ""
 "<p>This is the ID of the account holding the IMAP resource folders.</p>"
 
-#: kmail.kcfg:270
+#: kmail.kcfg:266
 #, no-c-format
 msgid ""
 "<p>If you want to set the folder names of the IMAP storage to your local "
@@ -13601,18 +13601,18 @@ msgstr ""
 "Outlook. It is considered a bad idea to set this, since it makes changing "
 "languages impossible. </p><p>So do not set this unless you have to.</p>"
 
-#: kmail.kcfg:276
+#: kmail.kcfg:272
 #, no-c-format
 msgid "Also filter new mails received in groupware folders."
 msgstr ""
 
-#: kmail.kcfg:283
+#: kmail.kcfg:279
 #, no-c-format
 msgid ""
 "Synchronize groupware changes in DIMAP folders immediately when being online."
 msgstr ""
 
-#: kmail.kcfg:292
+#: kmail.kcfg:288
 #, no-c-format
 msgid ""
 "This value is used to decide whether the KMail Introduction should be "
@@ -13621,12 +13621,12 @@ msgstr ""
 "This value is used to decide whether the KMail Introduction should be "
 "displayed."
 
-#: kmail.kcfg:299
+#: kmail.kcfg:295
 #, no-c-format
 msgid "Maximal number of connections per host"
 msgstr "Maximal number of connections per host"
 
-#: kmail.kcfg:300
+#: kmail.kcfg:296
 #, no-c-format
 msgid ""
 "This can be used to restrict the number of connections per host while "
@@ -13635,12 +13635,12 @@ msgstr ""
 "This can be used to restrict the number of connections per host while "
 "checking for new mail. By default the number of connections is unlimited (0)."
 
-#: kmail.kcfg:308
+#: kmail.kcfg:304
 #, no-c-format
 msgid "Show quick search line edit"
 msgstr "Show quick search line edit"
 
-#: kmail.kcfg:309
+#: kmail.kcfg:305
 #, no-c-format
 msgid ""
 "This option enables or disables the search line edit above the message list "
@@ -13651,34 +13651,34 @@ msgstr ""
 "which can be used to quickly search the information shown in the message "
 "list."
 
-#: kmail.kcfg:313
+#: kmail.kcfg:309
 #, no-c-format
 msgid "Hide local inbox if unused"
 msgstr ""
 
-#: kmail.kcfg:321
+#: kmail.kcfg:317
 #, no-c-format
 msgid "Forward Inline As Default."
 msgstr ""
 
-#: kmail.kcfg:325
+#: kmail.kcfg:321
 #, no-c-format
 msgid ""
 "Allow the semicolon charactor (';') to be used as separator in the message "
 "composer."
 msgstr ""
 
-#: kmail.kcfg:328
+#: kmail.kcfg:324
 #, no-c-format
 msgid "Keep original charset when replying or forwarding if possible"
 msgstr "Keep original charset when replying or forwarding if possible"
 
-#: kmail.kcfg:332
+#: kmail.kcfg:328
 #, fuzzy, no-c-format
 msgid "A&utomatically insert signature"
 msgstr "A&utomatically append signature"
 
-#: kmail.kcfg:336
+#: kmail.kcfg:332
 #, no-c-format
 msgid ""
 "Remember this identity, so that it will be used in future composer windows "
@@ -13689,7 +13689,7 @@ msgstr ""
 "as well.\n"
 "        "
 
-#: kmail.kcfg:341
+#: kmail.kcfg:337
 #, no-c-format
 msgid ""
 "Remember this folder for sent items, so that it will be used in future "
@@ -13698,7 +13698,7 @@ msgstr ""
 "Remember this folder for sent items, so that it will be used in future "
 "composer windows as well."
 
-#: kmail.kcfg:345
+#: kmail.kcfg:341
 #, no-c-format
 msgid ""
 "Remember this mail transport, so that it will be used in future composer "
@@ -13707,7 +13707,7 @@ msgstr ""
 "Remember this mail transport, so that it will be used in future composer "
 "windows as well."
 
-#: kmail.kcfg:349
+#: kmail.kcfg:345
 #, fuzzy, no-c-format
 msgid ""
 "Remember this dictionary, so that it will be used in future composer windows "
@@ -13718,17 +13718,17 @@ msgstr ""
 "as well.\n"
 "        "
 
-#: kmail.kcfg:354
+#: kmail.kcfg:350
 #, no-c-format
 msgid "Word &wrap at column:"
 msgstr "Word &wrap at column:"
 
-#: kmail.kcfg:368
+#: kmail.kcfg:364
 #, fuzzy, no-c-format
 msgid "Warn if the number of recipients is larger than"
 msgstr "Warn if root certificate expires in &less than:"
 
-#: kmail.kcfg:370 kmail.kcfg:377
+#: kmail.kcfg:366 kmail.kcfg:373
 #, no-c-format
 msgid ""
 "If the number of recipients is larger than this value, KMail will warn and "
@@ -13736,7 +13736,7 @@ msgid ""
 "off."
 msgstr ""
 
-#: kmail.kcfg:390
+#: kmail.kcfg:386
 #, no-c-format
 msgid ""
 "Turn this option on to make Outlook &#8482; understand attachment names "
@@ -13745,12 +13745,12 @@ msgstr ""
 "Turn this option on to make Outlook &#8482; understand attachment names "
 "containing non-English characters"
 
-#: kmail.kcfg:416
+#: kmail.kcfg:412
 #, no-c-format
 msgid "Automatically request &message disposition notifications"
 msgstr "Automatically request &message disposition notifications"
 
-#: kmail.kcfg:417
+#: kmail.kcfg:413
 #, no-c-format
 msgid ""
 "<qt><p>Enable this option if you want KMail to request Message Disposition "
@@ -13765,12 +13765,12 @@ msgstr ""
 "a per-message basis in the composer, menu item <em>Options</em>-><em>Request "
 "Disposition Notification</em>.</p></qt>"
 
-#: kmail.kcfg:421
+#: kmail.kcfg:417
 #, no-c-format
 msgid "Use recent addresses for autocompletion"
 msgstr "Use recent addresses for autocompletion"
 
-#: kmail.kcfg:422
+#: kmail.kcfg:418
 #, no-c-format
 msgid ""
 "Disable this option if you do not want recently used addresses to appear in "
@@ -13779,12 +13779,12 @@ msgstr ""
 "Disable this option if you do not want recently used addresses to appear in "
 "the autocompletion list in the composer's address fields."
 
-#: kmail.kcfg:443
+#: kmail.kcfg:439
 #, no-c-format
 msgid "Autosave interval:"
 msgstr "Autosave interval:"
 
-#: kmail.kcfg:444
+#: kmail.kcfg:440
 #, no-c-format
 msgid ""
 "A backup copy of the text in the composer window can be created regularly. "
@@ -13795,42 +13795,42 @@ msgstr ""
 "The interval used to create the backups is set here. You can disable "
 "autosaving by setting it to the value 0."
 
-#: kmail.kcfg:448
+#: kmail.kcfg:444
 #, no-c-format
 msgid "Insert signatures above quoted text"
 msgstr ""
 
-#: kmail.kcfg:455
+#: kmail.kcfg:451
 #, no-c-format
 msgid "Replace recognized prefi&x with \"Re:\""
 msgstr "Replace recognised prefi&x with \"Re:\""
 
-#: kmail.kcfg:462
+#: kmail.kcfg:458
 #, no-c-format
 msgid "Replace recognized prefix with \"&Fwd:\""
 msgstr "Replace recognised prefix with \"&Fwd:\""
 
-#: kmail.kcfg:466
+#: kmail.kcfg:462
 #, no-c-format
 msgid "Use smart &quoting"
 msgstr "Use smart &quoting"
 
-#: kmail.kcfg:470
+#: kmail.kcfg:466
 #, fuzzy, no-c-format
 msgid "Remove the signature when replying"
 msgstr "The signature has expired."
 
-#: kmail.kcfg:474
+#: kmail.kcfg:470
 #, no-c-format
 msgid "Only quote selected text when replying"
 msgstr ""
 
-#: kmail.kcfg:479
+#: kmail.kcfg:475
 #, no-c-format
 msgid "Type of addressee selector"
 msgstr "Type of addressee selector"
 
-#: kmail.kcfg:480
+#: kmail.kcfg:476
 #, no-c-format
 msgid ""
 "Sets the type of the dialog for selecting recipients for To,\n"
@@ -13839,12 +13839,12 @@ msgstr ""
 "Sets the type of the dialogue for selecting recipients for To,\n"
 "        CC and BCC."
 
-#: kmail.kcfg:489
+#: kmail.kcfg:485
 #, no-c-format
 msgid "Type of recipients editor"
 msgstr "Type of recipients editor"
 
-#: kmail.kcfg:490
+#: kmail.kcfg:486
 #, no-c-format
 msgid ""
 "Sets the type of the recipients editor for editing To,\n"
@@ -13853,41 +13853,41 @@ msgstr ""
 "Sets the type of the recipients editor for editing To,\n"
 "        CC and BCC."
 
-#: kmail.kcfg:506
+#: kmail.kcfg:502
 #, no-c-format
 msgid "Maximum number of recipient editor lines."
 msgstr "Maximum number of recipient editor lines."
 
-#: kmail.kcfg:512
+#: kmail.kcfg:508
 #, no-c-format
 msgid ""
 "List of message part types to strip off mails that are being forwarded "
 "inline."
 msgstr ""
 
-#: kmail.kcfg:516
+#: kmail.kcfg:512
 #, no-c-format
 msgid "The maximum size in MB that email attachments are allowed to have."
 msgstr ""
 
-#: kmail.kcfg:521
+#: kmail.kcfg:517
 #, no-c-format
 msgid "Show the Text Snippet Management and Insertion Panel in the composer."
 msgstr ""
 
-#: kmail.kcfg:528
+#: kmail.kcfg:524
 #, no-c-format
 msgid ""
 "Show the GnuPG Audit Log even after crypto operations that completed "
 "successfully."
 msgstr ""
 
-#: kmail.kcfg:557
+#: kmail.kcfg:553
 #, fuzzy, no-c-format
 msgid "Close message window after replying or forwarding the message."
 msgstr "Keep original charset when replying or forwarding if possible"
 
-#: kmail.kcfg:572
+#: kmail.kcfg:568
 #, no-c-format
 msgid ""
 "Some emails, especially those generated automatically, do not specify the "
@@ -13902,7 +13902,7 @@ msgstr ""
 "here. Set it to the character encoding most commonly used in your part of "
 "the world. As a default the encoding configured for the whole system is used."
 
-#: kmail.kcfg:578
+#: kmail.kcfg:574
 #, no-c-format
 msgid ""
 "Changing this from its default 'Auto' will force the use of the specified "
@@ -13911,7 +13911,7 @@ msgstr ""
 "Changing this from its default 'Auto' will force the use of the specified "
 "encoding for all emails, regardless of what they specify themselves."
 
-#: kmail.kcfg:584
+#: kmail.kcfg:580
 #, no-c-format
 msgid ""
 "Enable this if you want smileys like :-) appearing in the message text to be "
@@ -13920,7 +13920,7 @@ msgstr ""
 "Enable this if you want smileys like :-) appearing in the message text to be "
 "replaced by emoticons (small pictures)."
 
-#: kmail.kcfg:589
+#: kmail.kcfg:585
 #, no-c-format
 msgid ""
 "Enable this option to show different levels of quoted text. Disable to hide "
@@ -13929,66 +13929,66 @@ msgstr ""
 "Enable this option to show different levels of quoted text. Disable to hide "
 "the levels of quoted text."
 
-#: kmail.kcfg:592
+#: kmail.kcfg:588
 #, no-c-format
 msgid "Automatic collapse level:"
 msgstr "Automatic collapse level:"
 
-#: kmail.kcfg:600
+#: kmail.kcfg:596
 #, no-c-format
 msgid "Reduce font size for quoted text"
 msgstr "Reduce font size for quoted text"
 
-#: kmail.kcfg:601
+#: kmail.kcfg:597
 #, no-c-format
 msgid "Enable this option to show quoted text with a smaller font."
 msgstr "Enable this option to show quoted text with a smaller font."
 
-#: kmail.kcfg:612
+#: kmail.kcfg:608
 #, fuzzy, no-c-format
 msgid "Show current message sender time"
 msgstr "Store sent messages encry&pted"
 
-#: kmail.kcfg:613
+#: kmail.kcfg:609
 #, no-c-format
 msgid ""
 "Enable this if you like to know what time of day are now in sender location "
 "(calculated from sender time zone)."
 msgstr ""
 
-#: kmail.kcfg:618
+#: kmail.kcfg:614
 #, fuzzy, no-c-format
 msgid "Show user agent in fancy headers"
 msgstr "Show s&pam status in fancy headers"
 
-#: kmail.kcfg:619
+#: kmail.kcfg:615
 #, no-c-format
 msgid ""
 "Enable this option to get the User-Agent and X-Mailer header lines displayed "
 "when using fancy headers."
 msgstr ""
 
-#: kmail.kcfg:624
+#: kmail.kcfg:620
 #, no-c-format
 msgid "Allow to delete attachments of existing mails."
 msgstr ""
 
-#: kmail.kcfg:628
+#: kmail.kcfg:624
 #, no-c-format
 msgid "Allow to edit attachments of existing mails."
 msgstr ""
 
-#: kmail.kcfg:633
+#: kmail.kcfg:629
 #, no-c-format
 msgid "Always decrypt messages when viewing or ask befor decrypting"
 msgstr ""
 
-#: kmail.kcfg:647
+#: kmail.kcfg:643
 #, no-c-format
 msgid "Send Message Disposition Notifications with an empty sender."
 msgstr "Send Message Disposition Notifications with an empty sender."
 
-#: kmail.kcfg:648
+#: kmail.kcfg:644
 #, no-c-format
 msgid ""
 "Send Message Disposition Notifications with an empty sender string. Some "
@@ -13999,64 +13999,64 @@ msgstr ""
 "servers might be configure to reject such messages, so if you are "
 "experiencing problems sending MDNs, untick this option."
 
-#: kmail.kcfg:654
+#: kmail.kcfg:650
 #, no-c-format
 msgid "Phrases has been converted to templates"
 msgstr ""
 
-#: kmail.kcfg:655
+#: kmail.kcfg:651
 #, no-c-format
 msgid "Old phrases have been converted to templates"
 msgstr ""
 
-#: kmail.kcfg:659
+#: kmail.kcfg:655
 #, fuzzy, no-c-format
 msgid "Message template for new message"
 msgstr "Message List - New Messages"
 
-#: kmail.kcfg:664
+#: kmail.kcfg:660
 #, no-c-format
 msgid "Message template for reply"
 msgstr ""
 
-#: kmail.kcfg:669
+#: kmail.kcfg:665
 #, no-c-format
 msgid "Message template for reply to all"
 msgstr ""
 
-#: kmail.kcfg:674
+#: kmail.kcfg:670
 #, no-c-format
 msgid "Message template for forward"
 msgstr ""
 
-#: kmail.kcfg:679
+#: kmail.kcfg:675
 #, fuzzy, no-c-format
 msgid "Quote characters"
 msgstr "Add &Quote Characters"
 
-#: kmail.kcfg:688
+#: kmail.kcfg:684
 #, no-c-format
 msgid "Allow out-of-office settings to to be changeable by the user."
 msgstr ""
 
-#: kmail.kcfg:692
+#: kmail.kcfg:688
 #, no-c-format
 msgid ""
 "Allow users to upload out-of-office sieve scripts, but disallow them changin "
 "any settings, such as the domain to react to and the spam reaction switch."
 msgstr ""
 
-#: kmail.kcfg:696
+#: kmail.kcfg:692
 #, no-c-format
 msgid "Send out-of-office replies to mails coming from this domain only."
 msgstr ""
 
-#: kmail.kcfg:700
+#: kmail.kcfg:696
 #, no-c-format
 msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
 msgstr ""
 
-#: kmail.kcfg:704
+#: kmail.kcfg:700
 #, no-c-format
 msgid ""
 "Check if there is still an active out-of-office reply configured when "
diff --git a/tde-i18n-en_GB/messages/tdepim/kontact.po b/tde-i18n-en_GB/messages/tdepim/kontact.po
index 4ab59dd87cb..c31222d0279 100644
--- a/tde-i18n-en_GB/messages/tdepim/kontact.po
+++ b/tde-i18n-en_GB/messages/tdepim/kontact.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kontact\n"
-"POT-Creation-Date: 2020-05-11 13:04+0200\n"
+"POT-Creation-Date: 2020-09-27 21:14+0200\n"
 "PO-Revision-Date: 2006-03-12 17:42+0000\n"
 "Last-Translator: Malcolm Hunter <malcolm.hunter@gmx.co.uk>\n"
 "Language-Team: British English <kde-en-gb@kde.me.uk>\n"
@@ -141,21 +141,21 @@ msgstr "New Message..."
 msgid "Synchronize Mail"
 msgstr ""
 
-#: plugins/kmail/summarywidget.cpp:53
+#: plugins/kmail/summarywidget.cpp:52
 msgid "E-Mail"
 msgstr ""
 
-#: plugins/kmail/summarywidget.cpp:144
+#: plugins/kmail/summarywidget.cpp:143
 msgid ""
 "_: %1: number of unread messages %2: total number of messages\n"
 "%1 / %2"
 msgstr "%1 / %2"
 
-#: plugins/kmail/summarywidget.cpp:156
+#: plugins/kmail/summarywidget.cpp:155
 msgid "No unread messages in your monitored folders"
 msgstr "No unread messages in your monitored folders"
 
-#: plugins/kmail/summarywidget.cpp:169
+#: plugins/kmail/summarywidget.cpp:168
 msgid "Open Folder: \"%1\""
 msgstr "Open Folder: \"%1\""
 
diff --git a/tde-i18n-en_GB/messages/tdepim/libtdepim.po b/tde-i18n-en_GB/messages/tdepim/libtdepim.po
index 1ad50ddd0c2..8531bae375c 100644
--- a/tde-i18n-en_GB/messages/tdepim/libtdepim.po
+++ b/tde-i18n-en_GB/messages/tdepim/libtdepim.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libtdepim\n"
-"POT-Creation-Date: 2020-05-11 04:03+0200\n"
+"POT-Creation-Date: 2020-09-27 19:37+0200\n"
 "PO-Revision-Date: 2005-11-06 01:23+0000\n"
 "Last-Translator: Malcolm Hunter <malcolm.hunter@gmx.co.uk>\n"
 "Language-Team: British English <kde-en-gb@kde.me.uk>\n"
@@ -509,18 +509,18 @@ msgstr "Edit Completion Order"
 msgid "Showing URL %1"
 msgstr "Showing URL %1"
 
-#: kaddrbook.cpp:76
+#: kaddrbook.cpp:75
 #, fuzzy
 msgid ""
 "<qt>The email address <b>%1</b> cannot be found in your addressbook.</qt>"
 msgstr "<qt>The email address <b>%1</b> is already in your addressbook.</qt>"
 
-#: kaddrbook.cpp:79
+#: kaddrbook.cpp:78
 #, fuzzy
 msgid "is not in address book"
 msgstr "Cannot save to addressbook."
 
-#: kaddrbook.cpp:151
+#: kaddrbook.cpp:150
 msgid ""
 "<qt>The email address <b>%1</b> was added to your addressbook; you can add "
 "more information to this entry by opening the addressbook.</qt>"
@@ -528,11 +528,11 @@ msgstr ""
 "<qt>The email address <b>%1</b> was added to your addressbook; you can add "
 "more information to this entry by opening the addressbook.</qt>"
 
-#: kaddrbook.cpp:157
+#: kaddrbook.cpp:156
 msgid "<qt>The email address <b>%1</b> is already in your addressbook.</qt>"
 msgstr "<qt>The email address <b>%1</b> is already in your addressbook.</qt>"
 
-#: kaddrbook.cpp:188
+#: kaddrbook.cpp:187
 msgid ""
 "The VCard was added to your addressbook; you can add more information to "
 "this entry by opening the addressbook."
@@ -540,7 +540,7 @@ msgstr ""
 "The VCard was added to your addressbook; you can add more information to "
 "this entry by opening the addressbook."
 
-#: kaddrbook.cpp:195
+#: kaddrbook.cpp:194
 msgid ""
 "The VCard's primary email address is already in your addressbook; however, "
 "you may save the VCard into a file and import it into the addressbook "
@@ -929,33 +929,33 @@ msgstr "Local entry"
 msgid "New (remote) entry"
 msgstr "New (remote) entry"
 
-#: komposer/core/core.cpp:251
+#: komposer/core/core.cpp:250
 #, fuzzy
 msgid "&Send"
 msgstr "Send"
 
-#: komposer/core/core.cpp:255
+#: komposer/core/core.cpp:254
 msgid "&Queue"
 msgstr ""
 
-#: komposer/core/core.cpp:259
+#: komposer/core/core.cpp:258
 msgid "Save in &Drafts Folder"
 msgstr ""
 
-#: komposer/core/core.cpp:262
+#: komposer/core/core.cpp:261
 msgid "&Insert File..."
 msgstr ""
 
-#: addresspicker.ui:201 komposer/core/core.cpp:265
+#: addresspicker.ui:201 komposer/core/core.cpp:264
 #, no-c-format
 msgid "&Address Book"
 msgstr "&Address Book"
 
-#: komposer/core/core.cpp:268
+#: komposer/core/core.cpp:267
 msgid "&New Composer"
 msgstr ""
 
-#: komposer/core/core.cpp:273
+#: komposer/core/core.cpp:272
 msgid "&Attach File..."
 msgstr ""
 
@@ -1715,7 +1715,7 @@ msgstr ""
 msgid "Permissions Check"
 msgstr "Permissions Check"
 
-#: ../libemailfunctions/email.cpp:465
+#: ../libemailfunctions/email.cpp:464
 msgid ""
 "The email address you entered is not valid because it contains more than one "
 "@. You will not create valid messages if you do not change your address."
@@ -1723,7 +1723,7 @@ msgstr ""
 "The email address you entered is not valid because it contains more than one "
 "@. You will not create valid messages if you do not change your address."
 
-#: ../libemailfunctions/email.cpp:470
+#: ../libemailfunctions/email.cpp:469
 msgid ""
 "The email address you entered is not valid because it does not contain a @."
 "You will not create valid messages if you do not change your address."
@@ -1731,11 +1731,11 @@ msgstr ""
 "The email address you entered is not valid because it does not contain a @."
 "You will not create valid messages if you do not change your address."
 
-#: ../libemailfunctions/email.cpp:475
+#: ../libemailfunctions/email.cpp:474
 msgid "You have to enter something in the email address field."
 msgstr "You have to enter something in the email address field."
 
-#: ../libemailfunctions/email.cpp:477
+#: ../libemailfunctions/email.cpp:476
 msgid ""
 "The email address you entered is not valid because it does not contain a "
 "local part."
@@ -1743,7 +1743,7 @@ msgstr ""
 "The email address you entered is not valid because it does not contain a "
 "local part."
 
-#: ../libemailfunctions/email.cpp:480
+#: ../libemailfunctions/email.cpp:479
 msgid ""
 "The email address you entered is not valid because it does not contain a "
 "domain part."
@@ -1751,7 +1751,7 @@ msgstr ""
 "The email address you entered is not valid because it does not contain a "
 "domain part."
 
-#: ../libemailfunctions/email.cpp:483
+#: ../libemailfunctions/email.cpp:482
 msgid ""
 "The email address you entered is not valid because it contains unclosed "
 "comments/brackets."
@@ -1759,11 +1759,11 @@ msgstr ""
 "The email address you entered is not valid because it contains unclosed "
 "comments/brackets."
 
-#: ../libemailfunctions/email.cpp:486
+#: ../libemailfunctions/email.cpp:485
 msgid "The email address you entered is valid."
 msgstr "The email address you entered is valid."
 
-#: ../libemailfunctions/email.cpp:488
+#: ../libemailfunctions/email.cpp:487
 msgid ""
 "The email address you entered is not valid because it contains an unclosed "
 "anglebracket."
@@ -1771,7 +1771,7 @@ msgstr ""
 "The email address you entered is not valid because it contains an unclosed "
 "anglebracket."
 
-#: ../libemailfunctions/email.cpp:491
+#: ../libemailfunctions/email.cpp:490
 msgid ""
 "The email address you entered is not valid because it contains an unopened "
 "anglebracket."
@@ -1779,7 +1779,7 @@ msgstr ""
 "The email address you entered is not valid because it contains an unopened "
 "anglebracket."
 
-#: ../libemailfunctions/email.cpp:494
+#: ../libemailfunctions/email.cpp:493
 msgid ""
 "The email address you have entered is not valid because it contains an "
 "unexpected comma."
@@ -1787,7 +1787,7 @@ msgstr ""
 "The email address you have entered is not valid because it contains an "
 "unexpected comma."
 
-#: ../libemailfunctions/email.cpp:497
+#: ../libemailfunctions/email.cpp:496
 msgid ""
 "The email address you entered is not valid because it ended unexpectedly, "
 "this probably means you have used an escaping type character like an \\  as "
@@ -1797,7 +1797,7 @@ msgstr ""
 "this probably means you have used an escaping type character like an \\  as "
 "the last character in your email address."
 
-#: ../libemailfunctions/email.cpp:502
+#: ../libemailfunctions/email.cpp:501
 msgid ""
 "The email address you entered is not valid because it contains quoted text "
 "which does not end."
@@ -1805,7 +1805,7 @@ msgstr ""
 "The email address you entered is not valid because it contains quoted text "
 "which does not end."
 
-#: ../libemailfunctions/email.cpp:505 ../libemailfunctions/email.cpp:566
+#: ../libemailfunctions/email.cpp:504 ../libemailfunctions/email.cpp:565
 msgid ""
 "The email address you entered is not valid because it does not seem to "
 "contain an actual email address, i.e. something of the form joe@kde.org."
@@ -1813,7 +1813,7 @@ msgstr ""
 "The email address you entered is not valid because it does not seem to "
 "contain an actual email address, i.e. something of the form joe@kde.org."
 
-#: ../libemailfunctions/email.cpp:509
+#: ../libemailfunctions/email.cpp:508
 msgid ""
 "The email address you entered is not valid because it contains an illegal "
 "character."
@@ -1821,7 +1821,7 @@ msgstr ""
 "The email address you entered is not valid because it contains an illegal "
 "character."
 
-#: ../libemailfunctions/email.cpp:512
+#: ../libemailfunctions/email.cpp:511
 msgid ""
 "The email address you have entered is not valid because it contains an "
 "invalid displayname."
@@ -1829,11 +1829,11 @@ msgstr ""
 "The email address you have entered is not valid because it contains an "
 "invalid displayname."
 
-#: ../libemailfunctions/email.cpp:515
+#: ../libemailfunctions/email.cpp:514
 msgid "Unknown problem with email address"
 msgstr "Unknown problem with email address"
 
-#: ../libkpimidentities/identity.cpp:104
+#: ../libkpimidentities/identity.cpp:103
 msgid "<qt>Failed to execute signature script<br><b>%1</b>:<br>%2</qt>"
 msgstr "<qt>Failed to execute signature script<br><b>%1</b>:<br>%2</qt>"