diff --git a/framework/ActiveSync/locale/Horde_ActiveSync.pot b/framework/ActiveSync/locale/Horde_ActiveSync.pot
index e3a4ec45502..2aa0e377deb 100644
--- a/framework/ActiveSync/locale/Horde_ActiveSync.pot
+++ b/framework/ActiveSync/locale/Horde_ActiveSync.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Horde_ActiveSync \n"
 "Report-Msgid-Bugs-To: dev@lists.horde.org\n"
-"POT-Creation-Date: 2013-10-14 14:26+0200\n"
+"POT-Creation-Date: 2013-10-29 10:13+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,12 +17,12 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: lib/Horde/ActiveSync/Imap/Message.php:539
+#: lib/Horde/ActiveSync/Imap/Message.php:543
 #, php-format
 msgid "%s part"
 msgstr ""
 
-#: lib/Horde/ActiveSync/Imap/Message.php:518
+#: lib/Horde/ActiveSync/Imap/Message.php:522
 msgid "Audio part"
 msgstr ""
 
@@ -30,7 +30,7 @@ msgstr ""
 msgid "Cc"
 msgstr ""
 
-#: lib/Horde/ActiveSync/Device.php:194
+#: lib/Horde/ActiveSync/Device.php:211
 msgid "Common Name"
 msgstr ""
 
@@ -38,7 +38,7 @@ msgstr ""
 msgid "Date"
 msgstr ""
 
-#: lib/Horde/ActiveSync/Device.php:206
+#: lib/Horde/ActiveSync/Device.php:223
 msgid "EAS Version"
 msgstr ""
 
@@ -46,43 +46,43 @@ msgstr ""
 msgid "From"
 msgstr ""
 
-#: lib/Horde/ActiveSync/Device.php:191
+#: lib/Horde/ActiveSync/Device.php:208
 msgid "IMEI"
 msgstr ""
 
-#: lib/Horde/ActiveSync/Device.php:182
+#: lib/Horde/ActiveSync/Device.php:199
 msgid "Id"
 msgstr ""
 
-#: lib/Horde/ActiveSync/Imap/Message.php:521
+#: lib/Horde/ActiveSync/Imap/Message.php:525
 msgid "Image part"
 msgstr ""
 
-#: lib/Horde/ActiveSync/Imap/Message.php:525
+#: lib/Horde/ActiveSync/Imap/Message.php:529
 msgid "Message part"
 msgstr ""
 
-#: lib/Horde/ActiveSync/Device.php:188
+#: lib/Horde/ActiveSync/Device.php:205
 msgid "Model"
 msgstr ""
 
-#: lib/Horde/ActiveSync/Imap/Message.php:528
+#: lib/Horde/ActiveSync/Imap/Message.php:532
 msgid "Multipart part"
 msgstr ""
 
-#: lib/Horde/ActiveSync/Device.php:197
+#: lib/Horde/ActiveSync/Device.php:214
 msgid "OS"
 msgstr ""
 
-#: lib/Horde/ActiveSync/Device.php:200
+#: lib/Horde/ActiveSync/Device.php:217
 msgid "OS Language"
 msgstr ""
 
-#: lib/Horde/ActiveSync/Device.php:203
+#: lib/Horde/ActiveSync/Device.php:220
 msgid "Phone Number"
 msgstr ""
 
-#: lib/Horde/ActiveSync/Device.php:183
+#: lib/Horde/ActiveSync/Device.php:200
 msgid "Policy Key"
 msgstr ""
 
@@ -94,7 +94,7 @@ msgstr ""
 msgid "Subject"
 msgstr ""
 
-#: lib/Horde/ActiveSync/Imap/Message.php:531
+#: lib/Horde/ActiveSync/Imap/Message.php:535
 msgid "Text part"
 msgstr ""
 
@@ -102,10 +102,10 @@ msgstr ""
 msgid "To"
 msgstr ""
 
-#: lib/Horde/ActiveSync/Device.php:184
+#: lib/Horde/ActiveSync/Device.php:201
 msgid "User Agent"
 msgstr ""
 
-#: lib/Horde/ActiveSync/Imap/Message.php:534
+#: lib/Horde/ActiveSync/Imap/Message.php:538
 msgid "Video part"
 msgstr ""
diff --git a/framework/Core/locale/Horde_Core.pot b/framework/Core/locale/Horde_Core.pot
index b73e1a1890e..5cec733a19e 100644
--- a/framework/Core/locale/Horde_Core.pot
+++ b/framework/Core/locale/Horde_Core.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Horde_Core \n"
 "Report-Msgid-Bugs-To: dev@lists.horde.org\n"
-"POT-Creation-Date: 2013-10-14 14:26+0200\n"
+"POT-Creation-Date: 2013-10-29 10:13+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -658,7 +658,7 @@ msgstr ""
 msgid "Ok"
 msgstr ""
 
-#: lib/Horde/Core/ActiveSync/Connector.php:680
+#: lib/Horde/Core/ActiveSync/Connector.php:682
 msgid "Out Of Office"
 msgstr ""
 
diff --git a/framework/Date/locale/Horde_Date.pot b/framework/Date/locale/Horde_Date.pot
index 1c2e3592e1c..f95226e8a21 100644
--- a/framework/Date/locale/Horde_Date.pot
+++ b/framework/Date/locale/Horde_Date.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Horde_Date \n"
 "Report-Msgid-Bugs-To: dev@lists.horde.org\n"
-"POT-Creation-Date: 2013-10-14 14:26+0200\n"
+"POT-Creation-Date: 2013-10-29 10:13+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -55,7 +55,7 @@ msgstr[1] ""
 msgid "Daily"
 msgstr ""
 
-#: lib/Horde/Date.php:251
+#: lib/Horde/Date.php:361
 #, php-format
 msgid "Failed to parse time string (%s)"
 msgstr ""
diff --git a/framework/Form/locale/Horde_Form.pot b/framework/Form/locale/Horde_Form.pot
index 8506555a32f..ddb97ddc30f 100644
--- a/framework/Form/locale/Horde_Form.pot
+++ b/framework/Form/locale/Horde_Form.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Horde_Form \n"
 "Report-Msgid-Bugs-To: dev@lists.horde.org\n"
-"POT-Creation-Date: 2013-01-29 11:43+0100\n"
+"POT-Creation-Date: 2013-10-29 10:13+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -409,11 +409,11 @@ msgstr ""
 msgid "Required Field"
 msgstr ""
 
-#: lib/Horde/Form.php:623
+#: lib/Horde/Form.php:618
 msgid "Required secret is invalid - potentially malicious request."
 msgstr ""
 
-#: lib/Horde/Form.php:359 lib/Horde/Form/Renderer.php:312
+#: lib/Horde/Form.php:354 lib/Horde/Form/Renderer.php:312
 msgid "Reset"
 msgstr ""
 
@@ -501,7 +501,7 @@ msgstr ""
 msgid "String list returning an array"
 msgstr ""
 
-#: lib/Horde/Form.php:352 lib/Horde/Form/Renderer.php:309
+#: lib/Horde/Form.php:347 lib/Horde/Form/Renderer.php:309
 msgid "Submit"
 msgstr ""
 
@@ -588,7 +588,7 @@ msgid ""
 "'#1234af'."
 msgstr ""
 
-#: lib/Horde/Form.php:620
+#: lib/Horde/Form.php:615
 msgid "This form has already been processed."
 msgstr ""
 
diff --git a/framework/Imap_Client/locale/Horde_Imap_Client.pot b/framework/Imap_Client/locale/Horde_Imap_Client.pot
index 300f40d2c58..72a1e3ac294 100644
--- a/framework/Imap_Client/locale/Horde_Imap_Client.pot
+++ b/framework/Imap_Client/locale/Horde_Imap_Client.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Horde_Imap_Client \n"
 "Report-Msgid-Bugs-To: dev@lists.horde.org\n"
-"POT-Creation-Date: 2013-10-14 14:26+0200\n"
+"POT-Creation-Date: 2013-10-29 10:13+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -22,11 +22,11 @@ msgstr ""
 msgid "%s not supported on POP3 servers."
 msgstr ""
 
-#: lib/Horde/Imap/Client/Socket.php:4594
+#: lib/Horde/Imap/Client/Socket.php:4614
 msgid "Authentication credentials have expired."
 msgstr ""
 
-#: lib/Horde/Imap/Client/Socket.php:4578
+#: lib/Horde/Imap/Client/Socket.php:4598
 msgid "Authentication failed."
 msgstr ""
 
@@ -34,7 +34,7 @@ msgstr ""
 msgid "Authentication failure."
 msgstr ""
 
-#: lib/Horde/Imap/Client/Socket.php:4586
+#: lib/Horde/Imap/Client/Socket.php:4606
 msgid "Authentication was successful, but authorization failed."
 msgstr ""
 
@@ -50,16 +50,16 @@ msgstr ""
 msgid "Cannot expunge read-only mailbox."
 msgstr ""
 
-#: lib/Horde/Imap/Client/Socket.php:4372
+#: lib/Horde/Imap/Client/Socket.php:4392
 msgid "Charset used in search query is not supported on the mail server."
 msgstr ""
 
-#: lib/Horde/Imap/Client/Socket.php:1042
+#: lib/Horde/Imap/Client/Socket.php:1068
 #, php-format
 msgid "Could not open mailbox \"%s\"."
 msgstr ""
 
-#: lib/Horde/Imap/Client/Socket.php:392
+#: lib/Horde/Imap/Client/Socket.php:393
 msgid "Could not open secure TLS connection to the IMAP server."
 msgstr ""
 
@@ -68,15 +68,16 @@ msgstr ""
 msgid "Could not open secure connection to the POP3 server."
 msgstr ""
 
-#: lib/Horde/Imap/Client/Socket.php:4478
+#: lib/Horde/Imap/Client/Socket.php:4498
 msgid "Could not save message data because it is too large."
 msgstr ""
 
-#: lib/Horde/Imap/Client/Socket.php:4469
+#: lib/Horde/Imap/Client/Socket.php:4489
 msgid "Could not save message on server."
 msgstr ""
 
-#: lib/Horde/Imap/Client/Socket/Connection.php:82
+#: lib/Horde/Imap/Client/Socket.php:565
+#: lib/Horde/Imap/Client/Socket/Pop3.php:284
 msgid "Error connecting to mail server."
 msgstr ""
 
@@ -91,36 +92,36 @@ msgstr ""
 msgid "Error converting UTF7-IMAP string."
 msgstr ""
 
-#: lib/Horde/Imap/Client/Socket.php:4041
-#: lib/Horde/Imap/Client/Socket/Connection/Pop3.php:71
-#: lib/Horde/Imap/Client/Socket/Connection/Socket.php:202
-#: lib/Horde/Imap/Client/Socket/Pop3.php:1157
+#: lib/Horde/Imap/Client/Socket.php:4067
+#: lib/Horde/Imap/Client/Socket/Connection/Pop3.php:70
+#: lib/Horde/Imap/Client/Socket/Connection/Socket.php:179
+#: lib/Horde/Imap/Client/Socket/Pop3.php:1177
 msgid "Error when communicating with the mail server."
 msgstr ""
 
-#: lib/Horde/Imap/Client/Socket.php:4144
+#: lib/Horde/Imap/Client/Socket.php:4179
 msgid "IMAP Server closed the connection."
 msgstr ""
 
-#: lib/Horde/Imap/Client/Socket.php:4132 lib/Horde/Imap/Client/Socket.php:4160
+#: lib/Horde/Imap/Client/Socket.php:4165
 msgid "IMAP error reported by server."
 msgstr ""
 
-#: lib/Horde/Imap/Client/Socket.php:3648
+#: lib/Horde/Imap/Client/Socket.php:3674
 #, php-format
 msgid "Invalid METADATA entry: \"%s\"."
 msgstr ""
 
-#: lib/Horde/Imap/Client/Socket.php:3735
+#: lib/Horde/Imap/Client/Socket.php:3761
 #, php-format
 msgid "Invalid METADATA value type \"%s\"."
 msgstr ""
 
-#: lib/Horde/Imap/Client/Socket/Connection/Socket.php:143
+#: lib/Horde/Imap/Client/Socket/Connection/Socket.php:120
 msgid "Mail server closed the connection unexpectedly."
 msgstr ""
 
-#: lib/Horde/Imap/Client/Socket.php:525
+#: lib/Horde/Imap/Client/Socket.php:533
 msgid "Mail server denied authentication."
 msgstr ""
 
@@ -129,15 +130,15 @@ msgstr ""
 msgid "Mailbox does not support mod-sequences."
 msgstr ""
 
-#: lib/Horde/Imap/Client/Socket.php:453
+#: lib/Horde/Imap/Client/Socket.php:461
 msgid "No supported IMAP authentication method could be found."
 msgstr ""
 
-#: lib/Horde/Imap/Client/Socket.php:4602
+#: lib/Horde/Imap/Client/Socket.php:4622
 msgid "Operation failed due to a lack of a secure connection."
 msgstr ""
 
-#: lib/Horde/Imap/Client/Socket/Pop3.php:1216
+#: lib/Horde/Imap/Client/Socket/Pop3.php:1236
 msgid "POP3 error reported by server."
 msgstr ""
 
@@ -145,15 +146,15 @@ msgstr ""
 msgid "POP3 server denied authentication."
 msgstr ""
 
-#: lib/Horde/Imap/Client/Socket.php:4570
+#: lib/Horde/Imap/Client/Socket.php:4590
 msgid "Remote server is temporarily unavailable."
 msgstr ""
 
-#: lib/Horde/Imap/Client/Socket/Connection/Pop3.php:63
+#: lib/Horde/Imap/Client/Socket/Connection/Pop3.php:62
 msgid "Server closed the connection unexpectedly."
 msgstr ""
 
-#: lib/Horde/Imap/Client/Socket.php:380
+#: lib/Horde/Imap/Client/Socket.php:381
 msgid "Server does not support TLS connections."
 msgstr ""
 
@@ -161,67 +162,67 @@ msgstr ""
 msgid "Server does not support secure connections."
 msgstr ""
 
-#: lib/Horde/Imap/Client/Socket.php:559
+#: lib/Horde/Imap/Client/Socket.php:585
 msgid "Server rejected connection."
 msgstr ""
 
-#: lib/Horde/Imap/Client/Socket/Connection/Pop3.php:42
-#: lib/Horde/Imap/Client/Socket/Connection/Socket.php:76
-#: lib/Horde/Imap/Client/Socket/Connection/Socket.php:109
+#: lib/Horde/Imap/Client/Socket/Connection/Pop3.php:41
+#: lib/Horde/Imap/Client/Socket/Connection/Socket.php:53
+#: lib/Horde/Imap/Client/Socket/Connection/Socket.php:86
 msgid "Server write error."
 msgstr ""
 
-#: lib/Horde/Imap/Client/Socket.php:4523
+#: lib/Horde/Imap/Client/Socket.php:4543
 msgid "The comparison algorithm was not recognized by the server."
 msgstr ""
 
-#: lib/Horde/Imap/Client/Socket.php:568
+#: lib/Horde/Imap/Client/Socket.php:594
 msgid "The mail server does not support IMAP4rev1 (RFC 3501)."
 msgstr ""
 
-#: lib/Horde/Imap/Client/Socket.php:4649
+#: lib/Horde/Imap/Client/Socket.php:4669
 msgid "The mail server has denied the request."
 msgstr ""
 
-#: lib/Horde/Imap/Client/Socket.php:4633
+#: lib/Horde/Imap/Client/Socket.php:4653
 msgid "The mail server is reporting corrupt data in your mailbox."
 msgstr ""
 
-#: lib/Horde/Imap/Client/Socket.php:4435
+#: lib/Horde/Imap/Client/Socket.php:4455
 msgid "The mail server was unable to parse the contents of the mail message."
 msgstr ""
 
-#: lib/Horde/Imap/Client/Socket.php:4388
+#: lib/Horde/Imap/Client/Socket.php:4408
 #, php-format
 msgid ""
 "The mail server was unable to parse the contents of the mail message: %s"
 msgstr ""
 
-#: lib/Horde/Imap/Client/Socket.php:4541
+#: lib/Horde/Imap/Client/Socket.php:4561
 msgid "The metadata item could not be saved because it is too large."
 msgstr ""
 
-#: lib/Horde/Imap/Client/Socket.php:4559
+#: lib/Horde/Imap/Client/Socket.php:4579
 msgid ""
 "The metadata item could not be saved because the maximum number of "
 "annotations has been exceeded."
 msgstr ""
 
-#: lib/Horde/Imap/Client/Socket.php:4550
+#: lib/Horde/Imap/Client/Socket.php:4570
 msgid ""
 "The metadata item could not be saved because the server does not support "
 "private annotations."
 msgstr ""
 
-#: lib/Horde/Imap/Client/Socket.php:4667
+#: lib/Horde/Imap/Client/Socket.php:4687
 msgid "The object could not be created because it already exists."
 msgstr ""
 
-#: lib/Horde/Imap/Client/Socket.php:4676
+#: lib/Horde/Imap/Client/Socket.php:4696
 msgid "The object could not be deleted because it does not exist."
 msgstr ""
 
-#: lib/Horde/Imap/Client/Socket.php:4658
+#: lib/Horde/Imap/Client/Socket.php:4678
 msgid ""
 "The operation failed because the quota has been exceeded on the mail server."
 msgstr ""
@@ -231,27 +232,27 @@ msgstr ""
 msgid "The server does not support the %s extension."
 msgstr ""
 
-#: lib/Horde/Imap/Client/Socket.php:4685
+#: lib/Horde/Imap/Client/Socket.php:4705
 msgid "The special-use attribute requested for the mailbox is not supported."
 msgstr ""
 
-#: lib/Horde/Imap/Client/Socket.php:4619
+#: lib/Horde/Imap/Client/Socket.php:4639
 msgid ""
 "There was a temporary issue when attempting this operation. Please try again "
 "later."
 msgstr ""
 
-#: lib/Horde/Imap/Client/Socket.php:657
-#: lib/Horde/Imap/Client/Socket/Pop3.php:319
+#: lib/Horde/Imap/Client/Socket.php:683
+#: lib/Horde/Imap/Client/Socket/Pop3.php:339
 msgid "Unexpected response from server when authenticating."
 msgstr ""
 
-#: lib/Horde/Imap/Client/Socket.php:694
-#: lib/Horde/Imap/Client/Socket/Pop3.php:365
+#: lib/Horde/Imap/Client/Socket.php:720
+#: lib/Horde/Imap/Client/Socket/Pop3.php:385
 #, php-format
 msgid "Unknown authentication method: %s"
 msgstr ""
 
-#: lib/Horde/Imap/Client/Socket.php:4610
+#: lib/Horde/Imap/Client/Socket.php:4630
 msgid "You do not have adequate permissions to carry out this operation."
 msgstr ""
diff --git a/framework/Mime/locale/Horde_Mime.pot b/framework/Mime/locale/Horde_Mime.pot
index 18b089fcf3e..9bff261ebe6 100644
--- a/framework/Mime/locale/Horde_Mime.pot
+++ b/framework/Mime/locale/Horde_Mime.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Horde_Mime \n"
 "Report-Msgid-Bugs-To: dev@lists.horde.org\n"
-"POT-Creation-Date: 2013-07-16 21:24+0200\n"
+"POT-Creation-Date: 2013-10-29 10:13+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -25,31 +25,31 @@ msgstr ""
 msgid "HTML Version of Message"
 msgstr ""
 
-#: lib/Horde/Mime/Headers.php:540
+#: lib/Horde/Mime/Headers.php:542
 msgid "List-Archive"
 msgstr ""
 
-#: lib/Horde/Mime/Headers.php:535
+#: lib/Horde/Mime/Headers.php:537
 msgid "List-Help"
 msgstr ""
 
-#: lib/Horde/Mime/Headers.php:542
+#: lib/Horde/Mime/Headers.php:544
 msgid "List-Id"
 msgstr ""
 
-#: lib/Horde/Mime/Headers.php:538
+#: lib/Horde/Mime/Headers.php:540
 msgid "List-Owner"
 msgstr ""
 
-#: lib/Horde/Mime/Headers.php:539
+#: lib/Horde/Mime/Headers.php:541
 msgid "List-Post"
 msgstr ""
 
-#: lib/Horde/Mime/Headers.php:537
+#: lib/Horde/Mime/Headers.php:539
 msgid "List-Subscribe"
 msgstr ""
 
-#: lib/Horde/Mime/Headers.php:536
+#: lib/Horde/Mime/Headers.php:538
 msgid "List-Unsubscribe"
 msgstr ""
 
diff --git a/framework/Smtp/locale/Horde_Smtp.pot b/framework/Smtp/locale/Horde_Smtp.pot
index c185a04ee2d..769e77404d9 100644
--- a/framework/Smtp/locale/Horde_Smtp.pot
+++ b/framework/Smtp/locale/Horde_Smtp.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Horde_Smtp \n"
 "Report-Msgid-Bugs-To: dev@lists.horde.org\n"
-"POT-Creation-Date: 2013-10-14 14:26+0200\n"
+"POT-Creation-Date: 2013-10-29 10:13+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -21,11 +21,11 @@ msgstr ""
 msgid "Could not open secure TLS connection to the server."
 msgstr ""
 
-#: lib/Horde/Smtp/Connection.php:101
+#: lib/Horde/Smtp.php:346
 msgid "Error connecting to SMTP server."
 msgstr ""
 
-#: lib/Horde/Smtp/Connection.php:242
+#: lib/Horde/Smtp/Connection.php:108
 msgid "Error when communicating with the server."
 msgstr ""
 
@@ -37,15 +37,15 @@ msgstr ""
 msgid "Mailbox unavailable."
 msgstr ""
 
-#: lib/Horde/Smtp/Connection.php:234
+#: lib/Horde/Smtp/Connection.php:100
 msgid "Server closed the connection unexpectedly."
 msgstr ""
 
-#: lib/Horde/Smtp.php:398
+#: lib/Horde/Smtp.php:424
 msgid "Server denied authentication."
 msgstr ""
 
-#: lib/Horde/Smtp.php:601
+#: lib/Horde/Smtp.php:627
 msgid "Server does not support TLS connections."
 msgstr ""
 
@@ -57,6 +57,6 @@ msgstr ""
 msgid "Server requires authentication."
 msgstr ""
 
-#: lib/Horde/Smtp/Connection.php:215
+#: lib/Horde/Smtp/Connection.php:81
 msgid "Server write error."
 msgstr ""
diff --git a/hermes/locale/hermes.pot b/hermes/locale/hermes.pot
index 47ca4934a53..551d8817699 100644
--- a/hermes/locale/hermes.pot
+++ b/hermes/locale/hermes.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Hermes H5 (2.0.0-git)\n"
 "Report-Msgid-Bugs-To: dev@lists.horde.org\n"
-"POT-Creation-Date: 2013-10-14 14:26+0200\n"
+"POT-Creation-Date: 2013-10-29 10:14+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -404,7 +404,7 @@ msgstr ""
 msgid "Error saving deliverable: %s"
 msgstr ""
 
-#: lib/Driver/Sql.php:304
+#: lib/Driver/Sql.php:305
 #, php-format
 msgid "Error: %s"
 msgstr ""
diff --git a/horde/locale/horde.pot b/horde/locale/horde.pot
index f08bc80f489..3c090a50ef6 100644
--- a/horde/locale/horde.pot
+++ b/horde/locale/horde.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Horde 5.1.5-git\n"
 "Report-Msgid-Bugs-To: dev@lists.horde.org\n"
-"POT-Creation-Date: 2013-10-14 14:25+0200\n"
+"POT-Creation-Date: 2013-10-29 10:13+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -278,7 +278,7 @@ msgstr ""
 msgid "Address"
 msgstr ""
 
-#: config/registry.php:131
+#: config/registry.php:132
 msgid "Address Book"
 msgstr ""
 
@@ -306,10 +306,14 @@ msgstr ""
 msgid "Alarm title"
 msgstr ""
 
-#: admin/alarms.php:141
+#: admin/alarms.php:146
 msgid "Alarms"
 msgstr ""
 
+#: admin/alarms.php:121
+msgid "Alarms have been disabled in the configuration"
+msgstr ""
+
 #: lib/Block/Fortune.php:93
 msgid "All"
 msgstr ""
@@ -388,7 +392,7 @@ msgstr ""
 msgid "Arabic (Windows-1256)"
 msgstr ""
 
-#: admin/alarms.php:130
+#: admin/alarms.php:134
 #, php-format
 msgid "Are you sure you want to delete '%s'?"
 msgstr ""
@@ -497,7 +501,7 @@ msgstr ""
 msgid "Bluetooth"
 msgstr ""
 
-#: config/registry.php:182
+#: config/registry.php:183
 msgid "Bookmarks"
 msgstr ""
 
@@ -513,7 +517,7 @@ msgstr ""
 msgid "Browser"
 msgstr ""
 
-#: config/registry.php:117
+#: config/registry.php:118
 msgid "Calendar"
 msgstr ""
 
@@ -662,7 +666,7 @@ msgstr ""
 msgid "Color Picker"
 msgstr ""
 
-#: config/registry.php:246
+#: config/registry.php:247
 msgid "Comics"
 msgstr ""
 
@@ -920,7 +924,7 @@ msgstr ""
 msgid "Delete"
 msgstr ""
 
-#: admin/alarms.php:129 admin/groups.php:206
+#: admin/alarms.php:133 admin/groups.php:206
 #, php-format
 msgid "Delete \"%s\""
 msgstr ""
@@ -947,7 +951,7 @@ msgstr ""
 msgid "Describe the Problem"
 msgstr ""
 
-#: config/registry.php:206
+#: config/registry.php:207
 msgid "Development"
 msgstr ""
 
@@ -1214,7 +1218,7 @@ msgstr ""
 msgid "Fields to search"
 msgstr ""
 
-#: config/registry.php:312
+#: config/registry.php:313
 msgid "File Manager"
 msgstr ""
 
@@ -1222,7 +1226,7 @@ msgstr ""
 msgid "Filter"
 msgstr ""
 
-#: config/registry.php:88
+#: config/registry.php:89
 msgid "Filters"
 msgstr ""
 
@@ -1256,7 +1260,7 @@ msgstr ""
 msgid "Forgot your password?"
 msgstr ""
 
-#: config/registry.php:341
+#: config/registry.php:342
 msgid "Forms"
 msgstr ""
 
@@ -1276,7 +1280,7 @@ msgstr ""
 msgid "Fortunes 2"
 msgstr ""
 
-#: config/registry.php:335
+#: config/registry.php:336
 msgid "Forums"
 msgstr ""
 
@@ -1408,7 +1412,7 @@ msgstr ""
 msgid "Home Directory"
 msgstr ""
 
-#: config/registry.php:75
+#: config/registry.php:76
 msgid "Horde"
 msgstr ""
 
@@ -1474,7 +1478,7 @@ msgstr ""
 msgid "Individual Users"
 msgstr ""
 
-#: config/registry.php:240
+#: config/registry.php:241
 msgid "Information"
 msgstr ""
 
@@ -1511,7 +1515,7 @@ msgstr ""
 msgid "Invalid parent permission."
 msgstr ""
 
-#: config/registry.php:293
+#: config/registry.php:294
 msgid "Inventory"
 msgstr ""
 
@@ -1519,7 +1523,7 @@ msgstr ""
 msgid "Japanese (ISO-2022-JP)"
 msgstr ""
 
-#: login.php:164
+#: login.php:168
 msgid ""
 "JavaScript is either disabled or not available on your browser. You are "
 "restricted to the minimal view."
@@ -1541,7 +1545,7 @@ msgstr ""
 msgid "Kids"
 msgstr ""
 
-#: config/registry.php:301
+#: config/registry.php:302
 msgid "Kolab"
 msgstr ""
 
@@ -1549,7 +1553,7 @@ msgstr ""
 msgid "Korean (EUC-KR)"
 msgstr ""
 
-#: login.php:354 templates/login/login.inc:52
+#: login.php:358 templates/login/login.inc:52
 msgid "Language"
 msgstr ""
 
@@ -1615,7 +1619,7 @@ msgstr ""
 msgid "List Tables"
 msgstr ""
 
-#: admin/alarms.php:137
+#: admin/alarms.php:141
 #, php-format
 msgid "Listing alarms failed: %s"
 msgstr ""
@@ -1668,7 +1672,7 @@ msgstr ""
 msgid "Locks"
 msgstr ""
 
-#: login.php:281 templates/login/login.inc:61
+#: login.php:285 templates/login/login.inc:61
 #: templates/topbar/_menubar.html.php:10
 msgid "Log in"
 msgstr ""
@@ -1681,11 +1685,11 @@ msgstr ""
 msgid "Logged in to Facebook"
 msgstr ""
 
-#: login.php:310
+#: login.php:314
 msgid "Login failed because your username or password was entered incorrectly."
 msgstr ""
 
-#: login.php:306
+#: login.php:310
 msgid "Login failed."
 msgstr ""
 
@@ -1718,11 +1722,11 @@ msgstr ""
 msgid "Magic"
 msgstr ""
 
-#: config/registry.php:80
+#: config/registry.php:81
 msgid "Mail"
 msgstr ""
 
-#: config/registry.php:346
+#: config/registry.php:347
 msgid "Mail Admin"
 msgstr ""
 
@@ -1816,6 +1820,10 @@ msgstr ""
 msgid "Mobile (Minimal)"
 msgstr ""
 
+#: templates/login/login.inc:25 templates/login/smartmobile.html.php:37
+msgid "Mobile (No JavaScript)"
+msgstr ""
+
 #: templates/login/login.inc:23 templates/login/smartmobile.html.php:35
 msgid "Mobile (Smartphone/Tablet)"
 msgstr ""
@@ -1841,7 +1849,7 @@ msgstr ""
 msgid "Moon Phases"
 msgstr ""
 
-#: config/registry.php:306
+#: config/registry.php:307
 msgid "My Account"
 msgstr ""
 
@@ -1910,7 +1918,7 @@ msgstr ""
 msgid "New passwords don't match."
 msgstr ""
 
-#: config/registry.php:251 lib/Block/Fortune.php:59
+#: config/registry.php:252 lib/Block/Fortune.php:59
 msgid "News"
 msgstr ""
 
@@ -2010,7 +2018,7 @@ msgstr ""
 msgid "Not Provisioned"
 msgstr ""
 
-#: config/registry.php:166
+#: config/registry.php:167
 msgid "Notes"
 msgstr ""
 
@@ -2038,7 +2046,7 @@ msgstr ""
 msgid "Offense filter"
 msgstr ""
 
-#: config/registry.php:263
+#: config/registry.php:264
 msgid "Office"
 msgstr ""
 
@@ -2081,7 +2089,7 @@ msgstr ""
 msgid "Other Options"
 msgstr ""
 
-#: config/registry.php:177
+#: config/registry.php:178
 msgid "Others"
 msgstr ""
 
@@ -2117,8 +2125,8 @@ msgstr ""
 msgid "P_HP Shell"
 msgstr ""
 
-#: login.php:201 admin/config/index.php:397 admin/user.php:39
-#: admin/user.php:53 config/registry.php:324
+#: login.php:205 admin/config/index.php:397 admin/user.php:39
+#: admin/user.php:53 config/registry.php:325
 #: templates/admin/user/update.inc:20
 msgid "Password"
 msgstr ""
@@ -2173,7 +2181,7 @@ msgstr ""
 msgid "Pets"
 msgstr ""
 
-#: config/registry.php:194
+#: config/registry.php:195
 msgid "Photos"
 msgstr ""
 
@@ -2181,11 +2189,11 @@ msgstr ""
 msgid "Platitudes"
 msgstr ""
 
-#: login.php:207
+#: login.php:211
 msgid "Please enter a password."
 msgstr ""
 
-#: login.php:206
+#: login.php:210
 msgid "Please enter a username."
 msgstr ""
 
@@ -2696,7 +2704,7 @@ msgstr ""
 msgid "Southern Hemisphere"
 msgstr ""
 
-#: config/registry.php:103
+#: config/registry.php:104
 msgid "Spam"
 msgstr ""
 
@@ -2826,7 +2834,7 @@ msgstr ""
 msgid "Tag Cloud"
 msgstr ""
 
-#: config/registry.php:152
+#: config/registry.php:153
 msgid "Tasks"
 msgstr ""
 
@@ -3005,11 +3013,11 @@ msgstr ""
 msgid "This VAT identification number is valid."
 msgstr ""
 
-#: config/registry.php:223
+#: config/registry.php:224
 msgid "Tickets"
 msgstr ""
 
-#: config/registry.php:269
+#: config/registry.php:270
 msgid "Time Tracking"
 msgstr ""
 
@@ -3204,7 +3212,7 @@ msgstr ""
 msgid "User to add:"
 msgstr ""
 
-#: login.php:196 admin/config/index.php:396 admin/user.php:36
+#: login.php:200 admin/config/index.php:396 admin/user.php:36
 #: admin/user.php:52 services/resetpassword.php:33
 #: templates/admin/user/approve.inc:23
 msgid "Username"
@@ -3234,7 +3242,7 @@ msgstr ""
 msgid "Version Check"
 msgstr ""
 
-#: config/registry.php:212
+#: config/registry.php:213
 msgid "Version Control"
 msgstr ""
 
@@ -3262,7 +3270,7 @@ msgstr ""
 msgid "Weather data provided by"
 msgstr ""
 
-#: config/registry.php:329
+#: config/registry.php:330
 msgid "Web Site"
 msgstr ""
 
@@ -3321,7 +3329,7 @@ msgstr ""
 msgid "Wifi"
 msgstr ""
 
-#: config/registry.php:200
+#: config/registry.php:201
 msgid "Wiki"
 msgstr ""
 
@@ -3361,7 +3369,7 @@ msgstr ""
 msgid "Work"
 msgstr ""
 
-#: config/registry.php:235
+#: config/registry.php:236
 msgid "X-Ref"
 msgstr ""
 
@@ -3447,7 +3455,7 @@ msgid ""
 "to login."
 msgstr ""
 
-#: login.php:302
+#: login.php:306
 msgid "You have been logged out."
 msgstr ""
 
@@ -3496,7 +3504,7 @@ msgstr ""
 msgid "Your Information"
 msgstr ""
 
-#: login.php:290
+#: login.php:294
 msgid ""
 "Your Internet Address has changed since the beginning of your session. To "
 "protect your security, you must login again."
@@ -3519,7 +3527,7 @@ msgid ""
 "has been disabled for some other reason."
 msgstr ""
 
-#: login.php:294
+#: login.php:298
 msgid ""
 "Your browser appears to have changed since the beginning of your session. To "
 "protect your security, you must login again."
@@ -3537,7 +3545,7 @@ msgstr ""
 msgid "Your full name:"
 msgstr ""
 
-#: login.php:314
+#: login.php:318
 msgid "Your login has expired."
 msgstr ""
 
@@ -3572,15 +3580,15 @@ msgstr ""
 msgid "Your password has expired"
 msgstr ""
 
-#: login.php:175
+#: login.php:179
 msgid "Your password has expired."
 msgstr ""
 
-#: login.php:286
+#: login.php:290
 msgid "Your session has expired. Please login again."
 msgstr ""
 
-#: login.php:298
+#: login.php:302
 msgid ""
 "Your session length has exceeded the maximum amount of time allowed. Please "
 "login again."
diff --git a/imp/locale/imp.pot b/imp/locale/imp.pot
index ebf9c0d937c..adb03cb2c4f 100644
--- a/imp/locale/imp.pot
+++ b/imp/locale/imp.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: IMP H5 (6.1.5-git)\n"
 "Report-Msgid-Bugs-To: dev@lists.horde.org\n"
-"POT-Creation-Date: 2013-10-14 14:26+0200\n"
+"POT-Creation-Date: 2013-10-29 10:14+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -287,7 +287,7 @@ msgid ""
 "recipient."
 msgstr ""
 
-#: lib/Compose.php:3019
+#: lib/Compose.php:3015
 msgid ""
 "A message you were composing when your session expired has been recovered. "
 "You may resume composing your message by going to your Drafts mailbox."
@@ -705,13 +705,13 @@ msgstr ""
 msgid "Attach:"
 msgstr ""
 
-#: lib/Compose.php:2955
+#: lib/Compose.php:2951
 #, php-format
 msgid ""
 "Attached file \"%s\" exceeds the attachment size limits. File NOT attached."
 msgstr ""
 
-#: lib/Compose.php:2955
+#: lib/Compose.php:2951
 msgid "Attached file exceeds the attachment size limits. File NOT attached."
 msgstr ""
 
@@ -1048,7 +1048,7 @@ msgstr ""
 msgid "Click here to open all mailto: links using %s."
 msgstr ""
 
-#: lib/Compose/LinkedAttachment.php:220
+#: lib/Compose/LinkedAttachment.php:227
 msgid "Click on the following link to permanently delete the attachment:"
 msgstr ""
 
@@ -1228,7 +1228,7 @@ msgstr ""
 msgid "Could not attach %s to the message."
 msgstr ""
 
-#: lib/Contents/View.php:160
+#: lib/Contents/View.php:163
 msgid "Could not auto-determine data type."
 msgstr ""
 
@@ -2779,7 +2779,7 @@ msgstr ""
 msgid "Message Size"
 msgstr ""
 
-#: lib/Basic/Message.php:686 lib/Contents/View.php:178
+#: lib/Basic/Message.php:686 lib/Contents/View.php:181
 msgid "Message Source"
 msgstr ""
 
@@ -2925,7 +2925,7 @@ msgstr ""
 msgid "Name and/or email cannot be empty"
 msgstr ""
 
-#: lib/Compose/LinkedAttachment.php:217
+#: lib/Compose/LinkedAttachment.php:224
 #, php-format
 msgid "Name: %s"
 msgstr ""
@@ -3176,7 +3176,7 @@ msgstr ""
 msgid "Nothing"
 msgstr ""
 
-#: lib/Compose/LinkedAttachment.php:207
+#: lib/Compose/LinkedAttachment.php:214
 msgid "Notification: Linked attachment downloaded"
 msgstr ""
 
@@ -3512,7 +3512,7 @@ msgstr ""
 msgid "Print"
 msgstr ""
 
-#: lib/Contents/View.php:245
+#: lib/Contents/View.php:248
 msgid "Printed By"
 msgstr ""
 
@@ -4239,7 +4239,7 @@ msgstr ""
 msgid "Sent"
 msgstr ""
 
-#: lib/Compose/LinkedAttachment.php:219
+#: lib/Compose/LinkedAttachment.php:226
 #, php-format
 msgid "Sent Date: %s"
 msgstr ""
@@ -5204,7 +5204,7 @@ msgstr ""
 msgid "Type"
 msgstr ""
 
-#: lib/Compose/LinkedAttachment.php:218
+#: lib/Compose/LinkedAttachment.php:225
 #, php-format
 msgid "Type: %s"
 msgstr ""
@@ -5223,7 +5223,7 @@ msgstr ""
 msgid "Undelete"
 msgstr ""
 
-#: lib/Ajax/Application/ShowMessage.php:434 lib/Mailbox/Ui.php:81
+#: lib/Ajax/Application/ShowMessage.php:440 lib/Mailbox/Ui.php:81
 #: lib/Message/Ui.php:318
 msgid "Undisclosed Recipients"
 msgstr ""
@@ -5841,7 +5841,7 @@ msgid ""
 "compose action."
 msgstr ""
 
-#: lib/Compose/LinkedAttachment.php:216
+#: lib/Compose/LinkedAttachment.php:223
 msgid "Your linked attachment has been downloaded by at least one user."
 msgstr ""
 
@@ -5961,11 +5961,11 @@ msgid_plural "and %d more mailboxes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/Compose.php:2862
+#: lib/Compose.php:2851
 msgid "attachment"
 msgstr ""
 
-#: lib/Contents/View.php:49
+#: lib/Contents/View.php:52
 msgid "attachments.zip"
 msgstr ""
 
@@ -6043,7 +6043,7 @@ msgstr ""
 msgid "not"
 msgstr ""
 
-#: lib/Contents/View.php:62
+#: lib/Contents/View.php:65
 #, php-format
 msgid "part %s"
 msgstr ""
diff --git a/ingo/locale/ingo.pot b/ingo/locale/ingo.pot
index 9e3a8eb253c..f87b9a59f64 100644
--- a/ingo/locale/ingo.pot
+++ b/ingo/locale/ingo.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ingo H5 (3.1.3-git)\n"
 "Report-Msgid-Bugs-To: dev@lists.horde.org\n"
-"POT-Creation-Date: 2013-10-14 14:26+0200\n"
+"POT-Creation-Date: 2013-10-29 10:13+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -84,7 +84,7 @@ msgstr ""
 msgid "Apply Filters"
 msgstr ""
 
-#: lib/Basic/Filters.php:248
+#: lib/Basic/Filters.php:258
 msgid "Are you sure you want to delete this rule?"
 msgstr ""
 
@@ -109,12 +109,12 @@ msgstr ""
 msgid "Bind failed: (%s) %s"
 msgstr ""
 
-#: lib/Basic/Filters.php:195 lib/Block/Overview.php:101 lib/Smartmobile.php:85
+#: lib/Basic/Filters.php:205 lib/Block/Overview.php:101 lib/Smartmobile.php:85
 #: templates/basic/blacklist/blacklist.html.php:5
 msgid "Blacklist"
 msgstr ""
 
-#: lib/Basic/Blacklist.php:123
+#: lib/Basic/Blacklist.php:126
 msgid "Blacklist Edit"
 msgstr ""
 
@@ -139,8 +139,8 @@ msgstr ""
 msgid "Cc"
 msgstr ""
 
-#: lib/Basic/Blacklist.php:68 lib/Basic/Forward.php:58 lib/Basic/Rule.php:189
-#: lib/Basic/Spam.php:71 lib/Basic/Vacation.php:72 lib/Basic/Whitelist.php:47
+#: lib/Basic/Blacklist.php:71 lib/Basic/Forward.php:59 lib/Basic/Rule.php:196
+#: lib/Basic/Spam.php:72 lib/Basic/Vacation.php:73 lib/Basic/Whitelist.php:50
 msgid "Changes saved."
 msgstr ""
 
@@ -152,7 +152,7 @@ msgstr ""
 msgid "Contains"
 msgstr ""
 
-#: lib/Basic/Filters.php:258 lib/Basic/Filters.php:259
+#: lib/Basic/Filters.php:268 lib/Basic/Filters.php:269
 #, php-format
 msgid "Copy %s"
 msgstr ""
@@ -178,7 +178,7 @@ msgstr ""
 msgid "Deactivate Script"
 msgstr ""
 
-#: lib/Basic/Filters.php:248 lib/Basic/Filters.php:249
+#: lib/Basic/Filters.php:258 lib/Basic/Filters.php:259
 #, php-format
 msgid "Delete %s"
 msgstr ""
@@ -219,12 +219,12 @@ msgstr ""
 msgid "Destination (To, Cc, Bcc, etc.)"
 msgstr ""
 
-#: lib/Basic/Filters.php:276 lib/Basic/Filters.php:277
+#: lib/Basic/Filters.php:286 lib/Basic/Filters.php:287
 #, php-format
 msgid "Disable %s"
 msgstr ""
 
-#: lib/Basic/Forward.php:90 lib/Basic/Spam.php:108 lib/Basic/Vacation.php:131
+#: lib/Basic/Forward.php:91 lib/Basic/Spam.php:109 lib/Basic/Vacation.php:132
 #: templates/basic/blacklist/blacklist.html.php:8
 #: templates/basic/rule/rule.html.php:14
 #: templates/basic/whitelist/whitelist.html.php:8
@@ -269,13 +269,13 @@ msgstr ""
 msgid "Edit"
 msgstr ""
 
-#: lib/Basic/Filters.php:238 lib/Basic/Filters.php:240
-#: lib/Basic/Filters.php:244
+#: lib/Basic/Filters.php:248 lib/Basic/Filters.php:250
+#: lib/Basic/Filters.php:254
 #, php-format
 msgid "Edit %s"
 msgstr ""
 
-#: lib/Basic/Filters.php:285 lib/Basic/Filters.php:286
+#: lib/Basic/Filters.php:295 lib/Basic/Filters.php:296
 #, php-format
 msgid "Enable %s"
 msgstr ""
@@ -351,11 +351,11 @@ msgstr ""
 msgid "Filter Rule"
 msgstr ""
 
-#: lib/Basic/Filters.php:310
+#: lib/Basic/Filters.php:320
 msgid "Filter Rules"
 msgstr ""
 
-#: lib/Basic/Script.php:102
+#: lib/Basic/Script.php:108
 msgid "Filter Script Display"
 msgstr ""
 
@@ -402,7 +402,7 @@ msgid ""
 "\"%s\"."
 msgstr ""
 
-#: lib/Basic/Rule.php:228
+#: lib/Basic/Rule.php:235
 msgid "Filter not found."
 msgstr ""
 
@@ -418,7 +418,7 @@ msgstr ""
 msgid "For an incoming message that matches:"
 msgstr ""
 
-#: lib/Basic/Filters.php:213 lib/Basic/Forward.php:88
+#: lib/Basic/Filters.php:223 lib/Basic/Forward.php:89
 #: lib/Block/Overview.php:75 lib/Smartmobile.php:100
 msgid "Forward"
 msgstr ""
@@ -436,7 +436,7 @@ msgstr ""
 msgid "Forwards"
 msgstr ""
 
-#: lib/Basic/Forward.php:95
+#: lib/Basic/Forward.php:96
 msgid "Forwards Edit"
 msgstr ""
 
@@ -570,11 +570,11 @@ msgstr ""
 msgid "Move"
 msgstr ""
 
-#: lib/Basic/Filters.php:271 templates/basic/filters/filters.html.php:64
+#: lib/Basic/Filters.php:281 templates/basic/filters/filters.html.php:64
 msgid "Move Rule Down"
 msgstr ""
 
-#: lib/Basic/Filters.php:268 templates/basic/filters/filters.html.php:59
+#: lib/Basic/Filters.php:278 templates/basic/filters/filters.html.php:59
 msgid "Move Rule Up"
 msgstr ""
 
@@ -713,31 +713,31 @@ msgstr ""
 msgid "Rule"
 msgstr ""
 
-#: lib/Basic/Filters.php:91
+#: lib/Basic/Filters.php:101
 #, php-format
 msgid "Rule \"%s\" copied."
 msgstr ""
 
-#: lib/Basic/Filters.php:68
+#: lib/Basic/Filters.php:78
 #, php-format
 msgid "Rule \"%s\" deleted."
 msgstr ""
 
-#: lib/Basic/Filters.php:107
+#: lib/Basic/Filters.php:117
 #, php-format
 msgid "Rule \"%s\" disabled."
 msgstr ""
 
-#: lib/Basic/Filters.php:113
+#: lib/Basic/Filters.php:123
 #, php-format
 msgid "Rule \"%s\" enabled."
 msgstr ""
 
-#: lib/Basic/Forward.php:67 lib/Basic/Spam.php:80 lib/Basic/Vacation.php:81
+#: lib/Basic/Forward.php:68 lib/Basic/Spam.php:81 lib/Basic/Vacation.php:82
 msgid "Rule Disabled"
 msgstr ""
 
-#: lib/Basic/Forward.php:62 lib/Basic/Spam.php:75 lib/Basic/Vacation.php:76
+#: lib/Basic/Forward.php:63 lib/Basic/Spam.php:76 lib/Basic/Vacation.php:77
 msgid "Rule Enabled"
 msgstr ""
 
@@ -782,12 +782,12 @@ msgstr ""
 msgid "Save Settings"
 msgstr ""
 
-#: lib/Basic/Forward.php:64 lib/Basic/Spam.php:77 lib/Basic/Vacation.php:78
+#: lib/Basic/Forward.php:65 lib/Basic/Spam.php:78 lib/Basic/Vacation.php:79
 #: lib/Form/Base.php:54
 msgid "Save and Disable"
 msgstr ""
 
-#: lib/Basic/Forward.php:59 lib/Basic/Spam.php:72 lib/Basic/Vacation.php:73
+#: lib/Basic/Forward.php:60 lib/Basic/Spam.php:73 lib/Basic/Vacation.php:74
 #: lib/Form/Base.php:52
 msgid "Save and Enable"
 msgstr ""
@@ -829,7 +829,7 @@ msgstr ""
 msgid "Select ruleset to display"
 msgstr ""
 
-#: lib/Basic/Rule.php:341 templates/basic/blacklist/blacklist.html.php:30
+#: lib/Basic/Rule.php:348 templates/basic/blacklist/blacklist.html.php:30
 msgid "Select target folder"
 msgstr ""
 
@@ -845,7 +845,7 @@ msgstr ""
 msgid "Sender"
 msgstr ""
 
-#: lib/Basic/Filters.php:135
+#: lib/Basic/Filters.php:145
 msgid "Settings successfully updated."
 msgstr ""
 
@@ -869,13 +869,13 @@ msgstr ""
 msgid "Source (From, Reply-to, etc.)"
 msgstr ""
 
-#: lib/Basic/Filters.php:219 lib/Block/Overview.php:112
+#: lib/Basic/Filters.php:229 lib/Block/Overview.php:112
 #: lib/Script/Maildrop.php:294 lib/Script/Sieve.php:394
 #: lib/Smartmobile.php:105
 msgid "Spam Filter"
 msgstr ""
 
-#: lib/Basic/Spam.php:106 lib/Basic/Spam.php:113
+#: lib/Basic/Spam.php:107 lib/Basic/Spam.php:114
 msgid "Spam Filtering"
 msgstr ""
 
@@ -948,13 +948,13 @@ msgstr ""
 msgid "User header"
 msgstr ""
 
-#: lib/Basic/Filters.php:207 lib/Basic/Vacation.php:129
+#: lib/Basic/Filters.php:217 lib/Basic/Vacation.php:130
 #: lib/Block/Overview.php:64 lib/Script/Maildrop.php:259
 #: lib/Script/Procmail.php:292 lib/Script/Sieve.php:367 lib/Smartmobile.php:95
 msgid "Vacation"
 msgstr ""
 
-#: lib/Basic/Vacation.php:136
+#: lib/Basic/Vacation.php:137
 msgid "Vacation Edit"
 msgstr ""
 
@@ -970,7 +970,7 @@ msgstr ""
 msgid "Vacation is not supported in the current filtering driver."
 msgstr ""
 
-#: lib/Basic/Rule.php:347
+#: lib/Basic/Rule.php:354
 msgid "Value"
 msgstr ""
 
@@ -982,12 +982,12 @@ msgstr ""
 msgid "Wh_itelist addresses:"
 msgstr ""
 
-#: lib/Basic/Filters.php:201 lib/Block/Overview.php:90 lib/Smartmobile.php:90
+#: lib/Basic/Filters.php:211 lib/Block/Overview.php:90 lib/Smartmobile.php:90
 #: templates/basic/whitelist/whitelist.html.php:5
 msgid "Whitelist"
 msgstr ""
 
-#: lib/Basic/Whitelist.php:80
+#: lib/Basic/Whitelist.php:83
 msgid "Whitelist Edit"
 msgstr ""
 
@@ -1016,12 +1016,12 @@ msgstr ""
 msgid "X-Spam-Status"
 msgstr ""
 
-#: lib/Basic/Filters.php:85 lib/Basic/Rule.php:177 lib/Basic/Rule.php:218
+#: lib/Basic/Filters.php:95 lib/Basic/Rule.php:184 lib/Basic/Rule.php:225
 #, php-format
 msgid "You are not allowed to create more than %d rules."
 msgstr ""
 
-#: lib/Basic/Filters.php:77 lib/Basic/Rule.php:38
+#: lib/Basic/Filters.php:87 lib/Basic/Rule.php:38
 msgid "You are not allowed to create or edit custom rules."
 msgstr ""
 
@@ -1031,17 +1031,17 @@ msgid ""
 "help for details."
 msgstr ""
 
-#: lib/Basic/Rule.php:101
+#: lib/Basic/Rule.php:108
 #, php-format
 msgid "You cannot create empty conditions. Please fill in a value for \"%s\"."
 msgstr ""
 
-#: lib/Basic/Filters.php:62
+#: lib/Basic/Filters.php:72
 msgid "You do not have permission to delete filter rules."
 msgstr ""
 
-#: lib/Basic/Filters.php:55 lib/Basic/Filters.php:130
-#: lib/Basic/Filters.php:140 lib/Basic/Rule.php:162
+#: lib/Basic/Filters.php:65 lib/Basic/Filters.php:140
+#: lib/Basic/Filters.php:150 lib/Basic/Rule.php:169
 msgid "You do not have permission to edit filter rules."
 msgstr ""
 
@@ -1049,7 +1049,7 @@ msgstr ""
 msgid "You have received a new message"
 msgstr ""
 
-#: lib/Basic/Rule.php:167
+#: lib/Basic/Rule.php:174
 msgid "You need to select at least one field to match."
 msgstr ""
 
diff --git a/kronolith/locale/kronolith.pot b/kronolith/locale/kronolith.pot
index 18a59946ed2..745b26a5b91 100644
--- a/kronolith/locale/kronolith.pot
+++ b/kronolith/locale/kronolith.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kronolith H5 (4.1.4-git)\n"
 "Report-Msgid-Bugs-To: dev@lists.horde.org\n"
-"POT-Creation-Date: 2013-10-14 14:26+0200\n"
+"POT-Creation-Date: 2013-10-29 10:14+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -36,7 +36,7 @@ msgstr ""
 msgid "%d %s before the event starts"
 msgstr ""
 
-#: lib/Event.php:2124
+#: lib/Event.php:2133
 #, php-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -48,14 +48,14 @@ msgstr[1] ""
 msgid "%d events"
 msgstr ""
 
-#: lib/Event.php:2127
+#: lib/Event.php:2136
 #, php-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/Event.php:2130
+#: lib/Event.php:2139
 #, php-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -67,7 +67,7 @@ msgstr[1] ""
 msgid "%d times"
 msgstr ""
 
-#: lib/Event.php:2121
+#: lib/Event.php:2130
 #, php-format
 msgid "%d week"
 msgid_plural "%d weeks"
@@ -111,7 +111,7 @@ msgstr ""
 msgid "%s Private %s &mdash; hides details if calendar is public %s"
 msgstr ""
 
-#: lib/Event.php:2138
+#: lib/Event.php:2147
 #, php-format
 msgid "%s at %s"
 msgstr ""
@@ -325,28 +325,28 @@ msgstr ""
 msgid "Alarm"
 msgstr ""
 
-#: lib/Event.php:3223
+#: lib/Event.php:3232
 #, php-format
 msgid "Alarm %d day before"
 msgid_plural "Alarm %d days before"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/Event.php:3226
+#: lib/Event.php:3235
 #, php-format
 msgid "Alarm %d hour before"
 msgid_plural "Alarm %d hours before"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/Event.php:3229
+#: lib/Event.php:3238
 #, php-format
 msgid "Alarm %d minute before"
 msgid_plural "Alarm %d minutes before"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/Event.php:3220
+#: lib/Event.php:3229
 #, php-format
 msgid "Alarm %d week before"
 msgid_plural "Alarm %d weeks before"
@@ -418,7 +418,7 @@ msgid "All Visible"
 msgstr ""
 
 #: lib/Ajax.php:132 lib/Block/Month.php:177 lib/Block/Summary.php:179
-#: lib/Event.php:3341 lib/View/Day.php:94 lib/View/Day.php:97
+#: lib/Event.php:3350 lib/View/Day.php:94 lib/View/Day.php:97
 #: lib/View/Week.php:123 lib/View/Week.php:148 lib/View/Year.php:135
 #: templates/agenda/notification.html.php:24
 #: templates/agenda/notification.plain.php:6 templates/dynamic/day.inc:14
@@ -884,7 +884,7 @@ msgstr ""
 msgid "Delegate"
 msgstr ""
 
-#: lib/Event.php:2325 lib/Event.php:3286 lib/Form/DeleteCalendar.php:34
+#: lib/Event.php:2334 lib/Event.php:3295 lib/Form/DeleteCalendar.php:34
 #: lib/Form/DeleteResource.php:37 lib/Form/DeleteResourceGroup.php:39
 #: lib/Form/EditCalendar.php:172 lib/Form/EditCalendar.php:190
 #: lib/Form/EditResource.php:73 lib/Form/EditResource.php:133
@@ -907,7 +907,7 @@ msgstr ""
 msgid "Delete"
 msgstr ""
 
-#: lib/Event.php:3283 lib/Form/DeleteCalendar.php:28
+#: lib/Event.php:3292 lib/Form/DeleteCalendar.php:28
 #: lib/Form/DeleteResource.php:31 lib/Form/DeleteResourceGroup.php:31
 #: lib/View/DeleteEvent.php:43
 #, php-format
@@ -926,7 +926,7 @@ msgstr ""
 msgid "Delete This and Future Events"
 msgstr ""
 
-#: lib/Event.php:2324
+#: lib/Event.php:2333
 #, php-format
 msgid "Delete exception on %s"
 msgstr ""
@@ -999,19 +999,19 @@ msgstr ""
 msgid "Duration"
 msgstr ""
 
-#: lib/Event.php:3047
+#: lib/Event.php:3056
 msgid "Duration Day"
 msgstr ""
 
-#: lib/Event.php:3058
+#: lib/Event.php:3067
 msgid "Duration Hour"
 msgstr ""
 
-#: lib/Event.php:3068
+#: lib/Event.php:3077
 msgid "Duration Minute"
 msgstr ""
 
-#: lib/Event.php:3271 templates/chunks/permissions.inc:105
+#: lib/Event.php:3280 templates/chunks/permissions.inc:105
 #: templates/chunks/permissions.inc:132 templates/chunks/permissions.inc:160
 #: templates/chunks/permissions.inc:213 templates/chunks/permissions.inc:260
 #: templates/perms/perms.inc:57 templates/perms/perms.inc:75
@@ -1024,7 +1024,7 @@ msgstr ""
 msgid "Edit"
 msgstr ""
 
-#: lib/Event.php:3268 lib/Form/EditCalendar.php:36
+#: lib/Event.php:3277 lib/Form/EditCalendar.php:36
 #: lib/Form/EditRemoteCalendar.php:22 lib/Form/EditResource.php:34
 #: lib/Form/EditResourceGroup.php:34 lib/View/EditEvent.php:44
 #: templates/attendees/attendees.inc:58
@@ -1093,19 +1093,19 @@ msgstr ""
 msgid "End Date"
 msgstr ""
 
-#: lib/Event.php:3020 templates/data/export.inc:161
+#: lib/Event.php:3029 templates/data/export.inc:161
 msgid "End Day"
 msgstr ""
 
-#: lib/Event.php:3032 templates/data/export.inc:178
+#: lib/Event.php:3041 templates/data/export.inc:178
 msgid "End Hour"
 msgstr ""
 
-#: lib/Event.php:3042 templates/data/export.inc:190
+#: lib/Event.php:3051 templates/data/export.inc:190
 msgid "End Minute"
 msgstr ""
 
-#: lib/Event.php:3012 templates/data/export.inc:148
+#: lib/Event.php:3021 templates/data/export.inc:148
 msgid "End Month"
 msgstr ""
 
@@ -1118,7 +1118,7 @@ msgstr ""
 msgid "End Time"
 msgstr ""
 
-#: lib/Event.php:3002 templates/data/export.inc:134
+#: lib/Event.php:3011 templates/data/export.inc:134
 msgid "End Year"
 msgstr ""
 
@@ -1208,15 +1208,15 @@ msgstr ""
 msgid "Events matching \"%s\""
 msgstr ""
 
-#: lib/Event.php:1874
+#: lib/Event.php:1883
 msgid "Events must have a start date."
 msgstr ""
 
-#: lib/Event.php:1841
+#: lib/Event.php:1850
 msgid "Events must have a title."
 msgstr ""
 
-#: lib/Ajax.php:164 lib/Event.php:2297 lib/Event.php:3238
+#: lib/Ajax.php:164 lib/Event.php:2306 lib/Event.php:3247
 #: templates/smartmobile/javascript_defs.php:178
 msgid "Exception"
 msgstr ""
@@ -1281,12 +1281,12 @@ msgstr ""
 msgid "From"
 msgstr ""
 
-#: lib/Event.php:2014
+#: lib/Event.php:2023
 #, php-format
 msgid "From %s at %s to %s at %s"
 msgstr ""
 
-#: lib/Event.php:2011
+#: lib/Event.php:2020
 #, php-format
 msgid "From %s to %s"
 msgstr ""
@@ -1469,7 +1469,7 @@ msgstr ""
 msgid "Loading..."
 msgstr ""
 
-#: data.php:57 lib/Event.php:3323 templates/dynamic/edit.inc:76
+#: data.php:57 lib/Event.php:3332 templates/dynamic/edit.inc:76
 #: templates/search/event_headers.inc:4 templates/view/view.inc:6
 msgid "Location"
 msgstr ""
@@ -1518,11 +1518,11 @@ msgstr ""
 msgid "Maximum number of events to display (0 = no limit)"
 msgstr ""
 
-#: lib/Event.php:3319
+#: lib/Event.php:3328
 msgid "Me"
 msgstr ""
 
-#: lib/Event.php:3248
+#: lib/Event.php:3257
 msgid "Meeting"
 msgstr ""
 
@@ -1719,11 +1719,11 @@ msgstr ""
 msgid "No items to display"
 msgstr ""
 
-#: lib/Event.php:2295 templates/edit/edit.inc:291
+#: lib/Event.php:2304 templates/edit/edit.inc:291
 msgid "No recurrence"
 msgstr ""
 
-#: lib/Event.php:2776
+#: lib/Event.php:2785
 msgid "No resources from this group were available"
 msgstr ""
 
@@ -1765,7 +1765,7 @@ msgstr ""
 msgid "On"
 msgstr ""
 
-#: lib/Event.php:2009
+#: lib/Event.php:2018
 #, php-format
 msgid "On %s"
 msgstr ""
@@ -1825,7 +1825,7 @@ msgstr ""
 msgid "Owner:"
 msgstr ""
 
-#: lib/Event.php:3318
+#: lib/Event.php:3327
 #, php-format
 msgid "Owner: %s"
 msgstr ""
@@ -1931,7 +1931,7 @@ msgstr ""
 msgid "Priority"
 msgstr ""
 
-#: lib/Event.php:3243
+#: lib/Event.php:3252
 msgid "Private event"
 msgstr ""
 
@@ -2010,15 +2010,15 @@ msgstr ""
 msgid "Recurrence End Date"
 msgstr ""
 
-#: lib/Event.php:3109
+#: lib/Event.php:3118
 msgid "Recurrence End Day"
 msgstr ""
 
-#: lib/Event.php:3095
+#: lib/Event.php:3104
 msgid "Recurrence End Month"
 msgstr ""
 
-#: lib/Event.php:3079
+#: lib/Event.php:3088
 msgid "Recurrence End Year"
 msgstr ""
 
@@ -2486,19 +2486,19 @@ msgstr ""
 msgid "Start Date"
 msgstr ""
 
-#: lib/Event.php:2979 templates/data/export.inc:68
+#: lib/Event.php:2988 templates/data/export.inc:68
 msgid "Start Day"
 msgstr ""
 
-#: lib/Event.php:2989 templates/data/export.inc:87
+#: lib/Event.php:2998 templates/data/export.inc:87
 msgid "Start Hour"
 msgstr ""
 
-#: lib/Event.php:2998 templates/data/export.inc:102
+#: lib/Event.php:3007 templates/data/export.inc:102
 msgid "Start Minute"
 msgstr ""
 
-#: lib/Event.php:2971 templates/data/export.inc:54
+#: lib/Event.php:2980 templates/data/export.inc:54
 msgid "Start Month"
 msgstr ""
 
@@ -2511,7 +2511,7 @@ msgstr ""
 msgid "Start Time"
 msgstr ""
 
-#: lib/Event.php:2961 templates/data/export.inc:39
+#: lib/Event.php:2970 templates/data/export.inc:39
 msgid "Start Year"
 msgstr ""
 
@@ -3436,7 +3436,7 @@ msgstr ""
 msgid "Your default calendar:"
 msgstr ""
 
-#: lib/Event.php:2386 lib/Event/Horde.php:272 lib/Event/Ical.php:66
+#: lib/Event.php:2395 lib/Event/Horde.php:272 lib/Event/Ical.php:66
 msgid "[Unnamed event]"
 msgstr ""
 
@@ -3494,7 +3494,7 @@ msgstr ""
 msgid "before the event starts. A value of \"0\" means no default alarms."
 msgstr ""
 
-#: lib/Event.php:2385
+#: lib/Event.php:2394
 msgid "busy"
 msgstr ""
 
diff --git a/mnemo/locale/mnemo.pot b/mnemo/locale/mnemo.pot
index 94a8c390a61..8f729262563 100644
--- a/mnemo/locale/mnemo.pot
+++ b/mnemo/locale/mnemo.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mnemo H5 (4.1.2-git)\n"
 "Report-Msgid-Bugs-To: dev@lists.horde.org\n"
-"POT-Creation-Date: 2013-08-20 17:52+0200\n"
+"POT-Creation-Date: 2013-10-29 10:14+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -498,7 +498,7 @@ msgstr ""
 msgid "Unfiled"
 msgstr ""
 
-#: lib/Api.php:289 lib/Api.php:351 lib/Api.php:441
+#: lib/Api.php:289 lib/Api.php:351 lib/Api.php:449
 #, php-format
 msgid "Unsupported Content-Type: %s"
 msgstr ""
diff --git a/nag/locale/nag.pot b/nag/locale/nag.pot
index 3c0823ab2d1..685abe79b9f 100644
--- a/nag/locale/nag.pot
+++ b/nag/locale/nag.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Nag H5 (4.1.3-git)\n"
 "Report-Msgid-Bugs-To: dev@lists.horde.org\n"
-"POT-Creation-Date: 2013-10-14 14:26+0200\n"
+"POT-Creation-Date: 2013-10-29 10:13+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -828,7 +828,7 @@ msgstr ""
 msgid "Private"
 msgstr ""
 
-#: data.php:54 lib/Task.php:758
+#: data.php:54 lib/Task.php:745
 msgid "Private Task"
 msgstr ""
 
diff --git a/whups/locale/whups.pot b/whups/locale/whups.pot
index 5891457f05b..553c144bbf3 100644
--- a/whups/locale/whups.pot
+++ b/whups/locale/whups.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Whups H5 (3.0.0-git)\n"
 "Report-Msgid-Bugs-To: dev@lists.horde.org\n"
-"POT-Creation-Date: 2013-10-14 14:26+0200\n"
+"POT-Creation-Date: 2013-10-29 10:14+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -260,7 +260,7 @@ msgstr ""
 msgid "Attachment %s deleted."
 msgstr ""
 
-#: lib/Driver/Sql.php:1337 lib/Ticket.php:539
+#: lib/Driver/Sql.php:1338 lib/Ticket.php:539
 #, php-format
 msgid "Attachment %s not found."
 msgstr ""
@@ -1128,7 +1128,7 @@ msgstr ""
 msgid "No queries have been saved."
 msgstr ""
 
-#: lib/Block/Query.php:64 lib/Driver/Sql.php:597
+#: lib/Block/Query.php:64 lib/Driver/Sql.php:598
 msgid "No query to run"
 msgstr ""
 
@@ -1752,7 +1752,7 @@ msgstr ""
 msgid "Text"
 msgstr ""
 
-#: lib/Driver/Sql.php:98 lib/Driver/Sql.php:1539
+#: lib/Driver/Sql.php:98 lib/Driver/Sql.php:1540
 msgid "That queue slug is already taken. Please select another."
 msgstr ""
 
@@ -2153,7 +2153,7 @@ msgstr ""
 msgid "Ticket %s - %s"
 msgstr ""
 
-#: lib/Driver/Sql.php:1154
+#: lib/Driver/Sql.php:1155
 #, php-format
 msgid "Ticket %s was not found."
 msgstr ""
@@ -2364,7 +2364,7 @@ msgstr ""
 msgid "You are not allowed to view ticket %d."
 msgstr ""
 
-#: lib/Driver/Sql.php:1164
+#: lib/Driver/Sql.php:1165
 #, php-format
 msgid "You do not have permission to access this ticket (%s)."
 msgstr ""