[pkg-horde] [SCM] Debian Horde Packages repository: imp4 package branch, debian-sid, updated. aead083f83c6c62023b693afc43c01150fb3d219

Gregory Colpart reg at foulademer.gcolpart.com
Tue Oct 20 18:09:40 UTC 2009


The following commit has been merged in the debian-sid branch:
commit 86551ce1d8119c93bce54eacf9308fccc7d2dddd
Author: Gregory Colpart <reg at foulademer.gcolpart.com>
Date:   Tue Oct 20 02:08:47 2009 +0200

    Import new upstream sources
    
    Summary: Import new upstream sources
    Keywords:
    
    Imported imp-h3-4.3.5
    into Git repository

diff --git a/compose.php b/compose.php
index b16e7b3..556f4be 100644
--- a/compose.php
+++ b/compose.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * $Horde: imp/compose.php,v 2.800.2.122 2009/01/30 00:07:13 jan Exp $
+ * $Horde: imp/compose.php,v 2.800.2.125 2009/06/15 22:57:25 jan Exp $
  *
  * Copyright 1999-2009 The Horde Project (http://www.horde.org/)
  *
@@ -435,7 +435,7 @@ case 'send_message':
         'save_attachments' => Util::getFormData('save_attachments_select'),
         'reply_type' => Util::getFormData('reply_type'),
         'reply_index' => (empty($reply_index) ? null : $reply_index . IMP_IDX_SEP . $thismailbox),
-        'encrypt' => Util::getFormData('encrypt_options'),
+        'encrypt' => $prefs->isLocked('default_encrypt') ? $prefs->getValue('default_encrypt') : Util::getFormData('encrypt_options'),
         'priority' => Util::getFormData('x_priority'),
         'readreceipt' => Util::getFormData('request_read_receipt')
     );
@@ -716,9 +716,10 @@ if ($pgp_passphrase_dialog || $pgp_symmetric_passphrase_dialog) {
 
 /* If PGP encryption is set by default, and we have a recipient list on first
  * load, make sure we have public keys for all recipients. */
-$encrypt_options = Util::getFormData('encrypt_options');
-$use_pgp = $prefs->getValue('use_pgp');
-if ($use_pgp) {
+$encrypt_options = $prefs->isLocked('default_encrypt')
+      ? $prefs->getValue('default_encrypt')
+      : Util::getFormData('encrypt_options');
+if ($prefs->getValue('use_pgp') && !$prefs->isLocked('default_encrypt')) {
     $default_encrypt = $prefs->getValue('default_encrypt');
     if (!$reloaded &&
         in_array($default_encrypt, array(IMP_PGP_ENCRYPT, IMP_PGP_SIGNENC))) {
@@ -1099,8 +1100,7 @@ if ($redirect) {
     }
     if ($_SESSION['imp']['file_upload']) {
         $compose_options[] = array(
-            'url' => Horde::link('#attachments', '', 'widget', null,
-                                 'Field.focus(\'upload_1\');return false;'),
+            'url' => Horde::link('#attachments', '', 'widget'),
             'img' => Horde::img('manage_attachments.png'),
             'label' => $show_text ? _("Attachments") : '');
     }
@@ -1147,9 +1147,13 @@ if ($redirect) {
 
     $t->set('use_encrypt', ($prefs->getValue('use_pgp') || $prefs->getValue('use_smime')));
     if ($t->get('use_encrypt')) {
-        $t->set('encrypt_label', Horde::label('encrypt_options', _("Encr_yption Options")));
-        $t->set('encrypt_options', IMP::encryptList($encrypt_options));
-        $t->set('help-encrypt', Help::link('imp', 'compose-options-encrypt'));
+        if ($prefs->isLocked('default_encrypt')) {
+            $t->set('use_encrypt', false);
+        } else {
+            $t->set('encrypt_label', Horde::label('encrypt_options', _("Encr_yption Options")));
+            $t->set('encrypt_options', IMP::encryptList($encrypt_options));
+            $t->set('help-encrypt', Help::link('imp', 'compose-options-encrypt'));
+        }
         $t->set('pgp_options', ($prefs->getValue('use_pgp') && $prefs->getValue('pgp_public_key')));
         if ($t->get('pgp_options')) {
             $t->set('pgp_attach_pubkey', Util::getFormData('pgp_attach_pubkey', $prefs->getValue('pgp_attach_pubkey')));
diff --git a/config/conf.xml b/config/conf.xml
index 425691a..1fbe8dd 100644
--- a/config/conf.xml
+++ b/config/conf.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!-- $Horde: imp/config/conf.xml,v 1.53.2.40 2009/02/05 21:05:39 slusarz Exp $ -->
+<!-- $Horde: imp/config/conf.xml,v 1.53.2.43 2009/07/02 06:18:15 slusarz Exp $ -->
 <configuration>
  <configtab name="utils" desc="External Utilities and Menu">
   <configsection name="spell">
@@ -237,7 +237,8 @@
   <configsection name="msgcache">
    <configswitch name="use_msgcache" desc="Should we cache the details of
    messages across sessions? This requires configuration of a Horde_Cache
-   driver in Horde.">false
+   driver in Horde. DO NOT ENABLE CACHING WITH POP3 SERVERS UNLESS THE
+   SERVER SUPPORTS THE UIDL EXTENSION.">false
     <case name="false" desc="No" />
     <case name="true" desc="Yes">
      <configswitch name="use_compress" desc="Should the contents of the cache
@@ -272,7 +273,8 @@
   <configsection name="mlistcache">
    <configswitch name="use_mlistcache" desc="Should we cache the mailbox
    message lists? This requires configuration of a Horde_Cache driver in
-   Horde.">false
+   Horde. DO NOT ENABLE CACHING WITH POP3 SERVERS UNLESS THE SERVER SUPPORTS
+   THE UIDL EXTENSION.">false
     <case name="false" desc="No" />
     <case name="true" desc="Yes">
      <configinteger name="lifetime" desc="The lifetime, in seconds, of the
@@ -416,7 +418,7 @@
    hooks.php.dist.">false</configboolean>
    <configboolean name="signature" required="false" desc="Should we use a
    custom signature hook? If so, make sure you define _imp_hook_signature() in
-   hooks.php. The hook will be used to set $_SESSION['imp']['user'] when
+   hooks.php. The hook will be used to dynamically set the signature when
    composing a message. There is an example in
    hooks.php.dist.">false</configboolean>
    <configboolean name="trailer" required="false" desc="Should we use a custom
diff --git a/config/hooks.php.dist b/config/hooks.php.dist
index bffddfc..59abd13 100644
--- a/config/hooks.php.dist
+++ b/config/hooks.php.dist
@@ -8,7 +8,7 @@
  *
  * For more information please see the horde/config/hooks.php.dist file.
  *
- * $Horde: imp/config/hooks.php.dist,v 1.3.2.6 2009/02/05 21:05:39 slusarz Exp $
+ * $Horde: imp/config/hooks.php.dist,v 1.3.2.9 2009/08/18 22:48:08 jan Exp $
  */
 
 // Here is an example signature hook function to set the signature from the
@@ -31,6 +31,47 @@
 //     }
 // }
 
+// Example hook to set the value of the add_source pref. Useful when using
+// a turba source with shares enabled (i.e. the example localsql configuration)
+// This requires Horde >= 3.3.5 to work correctly.
+
+// if (!function_exists('_prefs_hook_add_source')) {
+//     function _prefs_hook_add_source($username = null)
+//     {
+//         /** If you have Turba >= 2.3.2 you can simply do this: **/
+//         // return $GLOBALS['registry']->call('contacts/getDefaultShare');
+//
+//         /** Otherwise, need to be a bit more hackish **/
+//         $shares = &Horde_Share::singleton('turba');
+//         $sources = $shares->listShares(
+//             Auth::getAuth(), PERMS_EDIT, Auth::getAuth());
+//         foreach ($sources as $uid => $share) {
+//             $params = @unserialize($share->get('params'));
+//             if ($params['default']) {
+//                 return $uid;
+//             }
+//         }
+//     }
+// }
+
+// Example hook to set the value of the search_sources pref. Useful when using
+// a turba source with shares enabled (i.e. the example localsql
+// configuration)
+
+// if (!function_exists('_prefs_hook_search_sources')) {
+//     function _prefs_hook_search_sources($username = null)
+//     {
+//         if (!$username) {
+//             return;
+//         }
+//
+//         if ($GLOBALS['registry']->hasMethod('contacts/sources')) {
+//            $sources = $GLOBALS['registry']->call('contacts/sources');
+//            return implode("\t", array_keys($sources));
+//         }
+//     }
+// }
+
 // Here is an example _imp_hook_postlogin function to redirect to a
 // custom server after login.
 
diff --git a/config/mime_drivers.php.dist b/config/mime_drivers.php.dist
index 1019aaf..83ec9cb 100644
--- a/config/mime_drivers.php.dist
+++ b/config/mime_drivers.php.dist
@@ -1,6 +1,6 @@
 <?php
 /**
- * $Horde: imp/config/mime_drivers.php.dist,v 1.35.10.6 2008/07/07 16:26:53 jan Exp $
+ * $Horde: imp/config/mime_drivers.php.dist,v 1.35.10.7 2009/06/20 21:37:43 jan Exp $
  *
  * Decide which output drivers you want to activate for the IMP application.
  * Settings in this file override settings in horde/config/mime_drivers.php.
@@ -154,7 +154,10 @@ $mime_drivers['imp']['pgp'] = array(
     ),
     'icons' => array(
         'default' => 'encryption.png'
-    )
+    ),
+    /* Turn background green or red depending on whether a signature could
+     * be verified? */
+    'highlight' => true
 );
 
 /**
@@ -168,7 +171,10 @@ $mime_drivers['imp']['pkcs7'] = array(
     ),
     'icons' => array(
         'default' => 'encryption.png'
-    )
+    ),
+    /* Turn background green or red depending on whether a signature could
+     * be verified? */
+    'highlight' => true
 );
 
 /**
diff --git a/docs/CHANGES b/docs/CHANGES
index 1d4e573..3d01bb6 100644
--- a/docs/CHANGES
+++ b/docs/CHANGES
@@ -1,4 +1,26 @@
 ------
+v4.3.5
+------
+
+[mms] Upgrade prototype.js to v1.6.1.
+[jan] Add example hook for the search_sources preference (dom.lalot at gmail.com,
+      Request #7796).
+[mms] Fix renaming shared folders contained in empty namespaces (Bug #8468).
+[mms] Correctly handle NO untagged responses on login (Bug #8478).
+[mms] Correctly set charset of Bcc header in sent mail copy (Bug #8362).
+[mms] Fix spellcheck in text-mode for certain words in non-English locales
+      (Bug #8330).
+[mms] Fix some javascript if using IE 8 (uses IE 7 compatibility mode) (Bug
+      #8345).
+[jan] Allow to lock default_encrypt preference.
+[mjr] Add example hook for the add_source preference (Bug #8285).
+[mms] Fix unqualified domain preference (Bug #8272).
+[jan] Highlight signed messages depending on the signature verification.
+[mms] Fix display_folder hook (m.gabriel at das-netzwerkteam.de, Bug #8254).
+[jan] Use correct charset when rendering inline PGP data.
+
+
+------
 v4.3.4
 ------
 
diff --git a/docs/CREDITS b/docs/CREDITS
index c9e686a..a454711 100644
--- a/docs/CREDITS
+++ b/docs/CREDITS
@@ -36,6 +36,7 @@ Czech                   Pavel Chytil <pchytil at asp.ogi.edu>
                         Jan Krivanek <honza at atack.cz>
 Danish                  Martin List-Petersen <martin at list-petersen.dk>
                         Brian Truelsen <horde+i18n at briantruelsen.dk>
+                        Niels Baggesen <nba at users.sourceforge.net>
 Dutch                   Jan Kuipers <jrkuipers at lauwerscollege.nl>
                         Peter Arien <peter.arien at cc.kuleuven.ac.be>
                         Han Spruyt <han.spruyt at ijsselgroep.nl>
diff --git a/docs/RELEASE_NOTES b/docs/RELEASE_NOTES
index 777f3b6..5043bbb 100644
--- a/docs/RELEASE_NOTES
+++ b/docs/RELEASE_NOTES
@@ -1,48 +1,40 @@
 <?php
 /**
- * Release focus. Possible values:
- * 0 - N/A
- * 1 - Initial freshmeat announcement
- * 2 - Documentation
- * 3 - Code cleanup
- * 4 - Minor feature enhancements
- * 5 - Major feature enhancements
- * 6 - Minor bugfixes
- * 7 - Major bugfixes
- * 8 - Minor security fixes
- * 9 - Major security fixes
+ * Release focus. Possible values (multiple possible with arrays):
+ * Horde_Release::FOCUS_INITIAL - Initial announcement
+ * Horde_Release::FOCUS_MINORFEATURE - Minor feature enhancement
+ * Horde_Release::FOCUS_MAJORFEATURE - Major feature enhancement
+ * Horde_Release::FOCUS_MINORBUG - Minor bugfixes
+ * Horde_Release::FOCUS_MAJORBUG - Major bugfixes
+ * Horde_Release::FOCUS_MINORSECURITY - Minor security fixes
+ * Horde_Release::FOCUS_MAJORSECURITY - Major security fixes
+ * Horde_Release::FOCUS_DOCS - Documentation improvements
  */
-$this->notes['fm']['focus'] = 8;
+$this->notes['fm']['focus'] = array(Horde_Release::FOCUS_MINORBUG, Horde_Release::FOCUS_MINORFEATURE);
 
 /* Mailing list release notes. */
 $this->notes['ml']['changes'] = <<<ML
 The Horde Team is pleased to announce the final release of the Internet
-Messaging Program (IMP) version H3 (4.3.4).
-
-This is a bugfix and minor security release that fixes an issue with PGP
-messages sent or received from a user on the local server. All users are
-encouraged to upgrade to this release. Thanks to Peter Meier for reporting
-this issue.
+Messaging Program (IMP) version H3 (4.3.5).
 
 IMP, the Internet Messaging Program, is one of the most popular webmail
 applications available.  It allows universal, web-based access to IMAP and
 POP3 mail servers and provides a full range of features normally found only in
 desktop email clients.
 
-The major changes compared to IMP version H3 (4.3.3) are:
-    * Don't cache local PGP public keys retrieved from the address book.
-    * Fixed some URL escaping issue for certain links introduced with the
-      security fixes from 4.3.3.
-    * Fixed updating POP3 indices when deleting in mailbox view.
-    * Fixed some folder creation issues occasionally seen, most often during
-      maintenance tasks.
-    * Other minor bugfixes.
+The major changes compared to IMP version H3 (4.3.4) are:
+    * Highlight signed messages depending on the signature verification.
+    * Added hook examples for address book preferences.
+    * Fixed some javascript if using IE 8.
+    * Use correct charset when rendering inline PGP data.
+    * Fixed renaming shared folders contained in empty namespaces.
+    * Fixed spellcheck in text-mode for certain words in non-English locales.
+    * Other minor bugfixes and improvements.
 ML;
 
 /* Freshmeat release notes, not more than 600 characters. */
 $this->notes['fm']['changes'] = <<<FM
-This release fixes an issue involving PGP public keys retrieved from the local
-address book. In addition, the release includes other bugfixes and improvements.
+Signed messages are highlighted now depending on the signature verification. Hook examples for the address book preferences have been added. Some javascript if using IE 8 has been fixed. The correct charset is used now when rendering inline PGP data. Spellcheck in text-mode for certain words in non-English locales has been fixed. Other minor bugfixes and improvements have been made.
 FM;
 
 $this->notes['name'] = 'IMP';
diff --git a/folders.php b/folders.php
index 9d45260..00d9de0 100644
--- a/folders.php
+++ b/folders.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * $Horde: imp/folders.php,v 2.309.2.43 2009/01/06 15:24:01 jan Exp $
+ * $Horde: imp/folders.php,v 2.309.2.46 2009/08/06 17:12:43 slusarz Exp $
  *
  * Copyright 2000-2009 The Horde Project (http://www.horde.org/)
  *
@@ -172,17 +172,28 @@ case 'create_folder':
     break;
 
 case 'rename_folder':
-    $new_names = explode("\n", Util::getFormData('new_names'));
-    $old_names = explode("\n", Util::getFormData('old_names'));
+    // $old_names already in UTF7-IMAP
+    $old_names = array_map('trim', explode("\n", Util::getFormData('old_names')));
+    $new_names = array_map('trim', explode("\n", Util::getFormData('new_names')));
+
     $iMax = count($new_names);
     if (!empty($new_names) &&
         !empty($old_names) &&
         ($iMax == count($old_names))) {
-        for ($i = 0; $i < $iMax; $i++) {
-            $oldname = trim($old_names[$i], "\r\n");
-            $newname = trim($new_names[$i], "\r\n");
-            $newname = String::convertCharset($newname, NLS::getCharset(), 'UTF7-IMAP');
-            $imp_folder->rename($oldname, IMP::appendNamespace($newname));
+        for ($i = 0; $i < $iMax; ++$i) {
+            $old_ns = IMP::getNamespace($old_names[$i]);
+            $new = trim($new_names[$i], $old_ns['delimiter']);
+
+            /* If this is a personal namespace, then anything goes as far as
+             * the input. Just append the personal namespace to it. For
+             * others, add the  */
+            if (($old_ns['type'] == 'personal') ||
+                ($old_ns['name'] &&
+                 (stripos($new_names[$i], $old_ns['name']) !== 0))) {
+                $new = $old_ns['name'] . $new;
+            }
+
+            $imp_folder->rename($old_names[$i], String::convertCharset($new, NLS::getCharset(), 'UTF7-IMAP'));
         }
     }
     break;
diff --git a/js/SpellChecker.js b/js/SpellChecker.js
index 7954a80..bf723b4 100644
--- a/js/SpellChecker.js
+++ b/js/SpellChecker.js
@@ -1 +1 @@
-var SpellChecker=Class.create({options:{},resumeOnDblClick:true,state:"CheckSpelling",initialize:function(a,f,c,j,b,h){var g,i,e;this.url=a;this.target=f;this.statusButton=$(c);this.buttonStates=j;this.statusClass=h||"";this.statusButton.observe("click",this.process.bindAsEventListener(this));this.options.onComplete=this.onComplete.bind(this);if(b){g=new Element("DIV",{className:"autocomplete",id:"spellcheckpopdown"}).setStyle({position:"absolute"}).hide();e=new Element("UL");$H(b).each(function(d){e.insert({bottom:new Element("LI",{lc:d.key}).update(d.value)})});g.insert({bottom:e});this.localeChoices=new KeyNavList(g,{onChoose:this.setLocale.bindAsEventListener(this)});i=new Element("A",{className:"popdown"}).insert("&nbsp;").observe("click",function(){$("spellcheckpopdown").clonePosition(this.statusButton,{setHeight:false,setWidth:false,offsetTop:this.statusButton.getHeight()});this.localeChoices.show()}.bind(this));this.statusButton.insert({after:i});$(document.body).insert(g)}document.observe("click",this.onClick.bindAsEventListener(this));this.status("CheckSpelling")},setLocale:function(a){this.locale=a.readAttribute("lc")},targetValue:function(){var a=$(this.target);return(Object.isUndefined(a.value))?a.innerHTML:a.value},process:function(a){switch(this.state){case"CheckSpelling":this.spellCheck();break;case"ResumeEdit":this.resume();break}a.stop()},spellCheck:function(c){if(this.onBeforeSpellCheck){this.onBeforeSpellCheck()}var b=Object.clone(this.options),d=$H(),a=this.url;this.status("Checking");this.removeChoices();this.onNoError=c;d.set(this.target,this.targetValue());b.parameters=d.toQueryString();if(this.locale){a+="/locale="+this.locale}if(this.htmlAreaParent){a+="/html=1"}new Ajax.Request(a,b)},onClick:function(b){if(this.localeChoices){this.localeChoices.hide()}if(!this.choicesDiv){return true}var a=b.findElement("SPAN");if(a&&a==this.curWord){return true}this.removeChoices();this.curWord=null},onComplete:function(b){var a,f,g,j,e,c=0,h=$(this.target),k=b.responseText.evalJSON(true);this.removeChoices();if(Object.isUndefined(k)){this.status("Error");return}this.suggestions=k.suggestions||[];if(this.onNoError&&!this.suggestions.size()){this.status("CheckSpelling");this.onNoError();return}a=k.bad||[];f=this.targetValue();if(this.htmlAreaParent){f=f.replace(/\r?\n/g,"")}else{f=f.replace(/\r?\n/g,"~~~").escapeHTML()}$A(a).each(function(d){j=new RegExp("(?:^|\\b)"+RegExp.escape(d)+"(?:\\b|$)","g");e='<span index="'+(c++)+'" name="incorrect" class="incorrect">'+d+"</span>";f=f.replace(j,e);if(this.htmlAreaParent){f=f.replace(new RegExp("(<[^>]*)"+RegExp.escape(e)+"([^>]*>)","g"),"$1"+d+"$2")}},this);if(!this.reviewDiv){this.reviewDiv=new Element("div",{className:h.readAttribute("className")+" spellcheck"}).setStyle({overflow:"auto"});if(this.resumeOnDblClick){this.reviewDiv.observe("dblclick",this.resume.bind(this))}}g=h.getDimensions();this.reviewDiv.setStyle({width:g.width+"px",height:g.height+"px"});if(!this.htmlAreaParent){f=f.replace(/~~~/g,"<br />")}this.reviewDiv.update(f);this.reviewDiv.select('span[name="incorrect"]').invoke("observe","click",this.showSuggestions.bindAsEventListener(this));this.reviewDiv.select("A").invoke("observe","click",Event.stop);if(this.htmlAreaParent){Element.hide(this.htmlArea);$(this.htmlAreaParent).insert({bottom:this.reviewDiv})}else{h.hide().insert({before:this.reviewDiv})}this.status("ResumeEdit")},showSuggestions:function(d){var f,a=d.element(),b=new Element("UL");try{f=a.viewportOffset()}catch(c){f=[d.pointerX(),d.pointerY()]}this.removeChoices();this.choicesDiv=new Element("DIV",{className:"autocomplete"}).setStyle({left:f[0]+"px",top:(f[1]+16)+"px"}).hide();this.curWord=a;$A(this.suggestions[this.curWord.readAttribute("index")]).each(function(e){b.insert({bottom:new Element("LI").update(e)})});this.choicesDiv.insert({bottom:b});this.choices=new KeyNavList(this.choicesDiv,{onChoose:function(e){this.replaceWord(e,this.curWord)}.bind(this)}).show();$(document.body).insert(this.choicesDiv)},replaceWord:function(a,b){b.update(a.innerHTML).writeAttribute({className:"corrected"});this.removeChoices()},removeChoices:function(){if(this.choicesDiv){this.choicesDiv.remove();this.choicesDiv=null}},resume:function(){this.removeChoices();if(!this.reviewDiv){return}var a=$(this.target),b;this.reviewDiv.select('span[name="incorrect"]').each(function(c){c.replace(c.innerHTML)});this.reviewDiv.select("A").invoke("stopObserving","click");b=this.reviewDiv.innerHTML;if(!this.htmlAreaParent){b=b.replace(/<br *\/?>/gi,"~~~").unescapeHTML().replace(/~~~/g,"\n")}a.value=b;a.disabled=false;if(this.resumeOnDblClick){this.reviewDiv.stopObserving("dblclick")}this.reviewDiv.remove();this.reviewDiv=null;this.status("CheckSpelling");if(this.htmlAreaParent){Element.show(this.htmlArea)}else{a.show()}if(this.onAfterSpellCheck){this.onAfterSpellCheck()}},status:function(a){if(!this.statusButton){return}this.state=a;switch(this.statusButton.tagName){case"INPUT":this.statusButton.value=this.buttonStates[a];break;case"A":this.statusButton.update(this.buttonStates[a]);break}this.statusButton.className=this.statusClass+" "+a},isActive:function(){return(this.reviewDiv)}});
\ No newline at end of file
+var SpellChecker=Class.create({options:{},resumeOnDblClick:true,state:"CheckSpelling",initialize:function(a,f,c,j,b,h){var g,i,e;this.url=a;this.target=f;this.statusButton=$(c);this.buttonStates=j;this.statusClass=h||"";this.statusButton.observe("click",this.process.bindAsEventListener(this));this.options.onComplete=this.onComplete.bind(this);if(b){g=new Element("DIV",{className:"autocomplete",id:"spellcheckpopdown"}).setStyle({position:"absolute"}).hide();e=new Element("UL");$H(b).each(function(d){e.insert({bottom:new Element("LI",{lc:d.key}).update(d.value)})});g.insert({bottom:e});this.localeChoices=new KeyNavList(g,{onChoose:this.setLocale.bindAsEventListener(this)});i=new Element("A",{className:"popdown"}).insert("&nbsp;").observe("click",function(){$("spellcheckpopdown").clonePosition(this.statusButton,{setHeight:false,setWidth:false,offsetTop:this.statusButton.getHeight()});this.localeChoices.show()}.bind(this));this.statusButton.insert({after:i});$(document.body).insert(g)}document.observe("click",this.onClick.bindAsEventListener(this));this.status("CheckSpelling")},setLocale:function(a){this.locale=a.readAttribute("lc")},targetValue:function(){var a=$(this.target);return(Object.isUndefined(a.value))?a.innerHTML:a.value},process:function(a){switch(this.state){case"CheckSpelling":this.spellCheck();break;case"ResumeEdit":this.resume();break}a.stop()},spellCheck:function(c){if(this.onBeforeSpellCheck){this.onBeforeSpellCheck()}var b=Object.clone(this.options),d=$H(),a=this.url;this.status("Checking");this.removeChoices();this.onNoError=c;d.set(this.target,this.targetValue());b.parameters=d.toQueryString();if(this.locale){a+="/locale="+this.locale}if(this.htmlAreaParent){a+="/html=1"}new Ajax.Request(a,b)},onClick:function(b){if(this.localeChoices){this.localeChoices.hide()}if(!this.choicesDiv){return true}var a=b.findElement("SPAN");if(a&&a==this.curWord){return true}this.removeChoices();this.curWord=null},onComplete:function(f){var h,e,g,c=0,b=$(this.target),a=f.responseText.evalJSON(true);this.removeChoices();if(Object.isUndefined(a)){this.status("Error");return}this.suggestions=a.suggestions||[];if(this.onNoError&&!this.suggestions.size()){this.status("CheckSpelling");this.onNoError();return}h=a.bad||[];e=this.targetValue();e=this.htmlAreaParent?e.replace(/\r?\n/g,""):e.replace(/\r?\n/g,"~~~").escapeHTML();$A(h).each(function(d){var i='<span index="'+(c++)+'" name="incorrect" class="incorrect">'+d+"</span>";e=e.replace(new RegExp("(?:^|\\b)"+RegExp.escape(d)+"(?:\\b|$)","g"),i);e=e.replace(new RegExp("(<[^>]*)"+RegExp.escape(i)+"([^>]*>)","g"),"$1"+d+"$2")},this);if(!this.reviewDiv){this.reviewDiv=new Element("div",{className:b.readAttribute("className")+" spellcheck"}).setStyle({overflow:"auto"});if(this.resumeOnDblClick){this.reviewDiv.observe("dblclick",this.resume.bind(this))}}g=b.getDimensions();this.reviewDiv.setStyle({width:g.width+"px",height:g.height+"px"});if(!this.htmlAreaParent){e=e.replace(/~~~/g,"<br />")}this.reviewDiv.update(e);this.reviewDiv.select('span[name="incorrect"]').invoke("observe","click",this.showSuggestions.bindAsEventListener(this));this.reviewDiv.select("A").invoke("observe","click",Event.stop);if(this.htmlAreaParent){Element.hide(this.htmlArea);$(this.htmlAreaParent).insert({bottom:this.reviewDiv})}else{b.hide().insert({before:this.reviewDiv})}this.status("ResumeEdit")},showSuggestions:function(d){var f,a=d.element(),b=new Element("UL");try{f=a.viewportOffset()}catch(c){f=[d.pointerX(),d.pointerY()]}this.removeChoices();this.choicesDiv=new Element("DIV",{className:"autocomplete"}).setStyle({left:f[0]+"px",top:(f[1]+16)+"px"}).hide();this.curWord=a;$A(this.suggestions[this.curWord.readAttribute("index")]).each(function(e){b.insert({bottom:new Element("LI").update(e)})});this.choicesDiv.insert({bottom:b});this.choices=new KeyNavList(this.choicesDiv,{onChoose:function(e){this.replaceWord(e,this.curWord)}.bind(this)}).show();$(document.body).insert(this.choicesDiv)},replaceWord:function(a,b){b.update(a.innerHTML).writeAttribute({className:"corrected"});this.removeChoices()},removeChoices:function(){if(this.choicesDiv){this.choicesDiv.remove();this.choicesDiv=null}},resume:function(){this.removeChoices();if(!this.reviewDiv){return}var a=$(this.target),b;this.reviewDiv.select('span[name="incorrect"]').each(function(c){c.replace(c.innerHTML)});this.reviewDiv.select("A").invoke("stopObserving","click");b=this.reviewDiv.innerHTML;if(!this.htmlAreaParent){b=b.replace(/<br *\/?>/gi,"~~~").unescapeHTML().replace(/~~~/g,"\n")}a.value=b;a.disabled=false;if(this.resumeOnDblClick){this.reviewDiv.stopObserving("dblclick")}this.reviewDiv.remove();this.reviewDiv=null;this.status("CheckSpelling");if(this.htmlAreaParent){Element.show(this.htmlArea)}else{a.show()}if(this.onAfterSpellCheck){this.onAfterSpellCheck()}},status:function(a){if(!this.statusButton){return}this.state=a;switch(this.statusButton.tagName){case"INPUT":this.statusButton.value=this.buttonStates[a];break;case"A":this.statusButton.update(this.buttonStates[a]);break}this.statusButton.className=this.statusClass+" "+a},isActive:function(){return(this.reviewDiv)}});
\ No newline at end of file
diff --git a/js/src/SpellChecker.js b/js/src/SpellChecker.js
index 1848c4b..289b02e 100644
--- a/js/src/SpellChecker.js
+++ b/js/src/SpellChecker.js
@@ -3,7 +3,7 @@
  * was rewritten almost completely by Chuck Hagenbuch to use
  * Prototype/Scriptaculous.
  *
- * $Horde: imp/js/src/SpellChecker.js,v 1.36.2.12 2009/03/30 23:08:41 slusarz Exp $
+ * $Horde: imp/js/src/SpellChecker.js,v 1.36.2.13 2009/06/22 04:03:25 slusarz Exp $
  *
  * Copyright 2005-2009 The Horde Project (http://www.horde.org/)
  *
@@ -159,7 +159,7 @@ var SpellChecker = Class.create({
 
     onComplete: function(request)
     {
-        var bad, content, d, re, re_text,
+        var bad, content, d,
             i = 0,
             input = $(this.target),
             result = request.responseText.evalJSON(true);
@@ -182,20 +182,18 @@ var SpellChecker = Class.create({
         bad = result.bad || [];
 
         content = this.targetValue();
-        if (this.htmlAreaParent) {
-            content = content.replace(/\r?\n/g, '');
-        } else {
-            content = content.replace(/\r?\n/g, '~~~').escapeHTML();
-        }
+        content = this.htmlAreaParent
+            ? content.replace(/\r?\n/g, '')
+            : content.replace(/\r?\n/g, '~~~').escapeHTML();
 
         $A(bad).each(function(node) {
-            re = new RegExp("(?:^|\\b)" + RegExp.escape(node) + "(?:\\b|$)", 'g');
-            re_text = '<span index="' + (i++) + '" name="incorrect" class="incorrect">' + node + '</span>';
-            content = content.replace(re, re_text);
-            // Go through and see if we matched anything inside a tag.
-            if (this.htmlAreaParent) {
-                content = content.replace(new RegExp("(<[^>]*)" + RegExp.escape(re_text) + "([^>]*>)", 'g'), '\$1' + node + '\$2');
-            }
+            var re_text = '<span index="' + (i++) + '" name="incorrect" class="incorrect">' + node + '</span>';
+            content = content.replace(new RegExp("(?:^|\\b)" + RegExp.escape(node) + "(?:\\b|$)", 'g'), re_text);
+
+            // Go through and see if we matched anything inside a tag (i.e.
+            // class/name/incorrect is often matched if using a non-English
+            // lang).
+            content = content.replace(new RegExp("(<[^>]*)" + RegExp.escape(re_text) + "([^>]*>)", 'g'), '\$1' + node + '\$2');
         }, this);
 
         if (!this.reviewDiv) {
diff --git a/lib/Compose.php b/lib/Compose.php
index 22a7362..71ff970 100644
--- a/lib/Compose.php
+++ b/lib/Compose.php
@@ -17,7 +17,7 @@ define('IMP_VFS_LINK_ATTACH_PATH', '.horde/imp/attachments');
  * The IMP_Compose:: class contains functions related to generating
  * outgoing mail messages.
  *
- * $Horde: imp/lib/Compose.php,v 1.107.2.84 2009/01/06 15:24:03 jan Exp $
+ * $Horde: imp/lib/Compose.php,v 1.107.2.86 2009/07/29 06:04:42 slusarz Exp $
  *
  * Copyright 2002-2009 The Horde Project (http://www.horde.org/)
  *
@@ -792,7 +792,7 @@ class IMP_Compose {
 
             /* Keep Bcc: headers on saved messages. */
             if (!empty($header['bcc'])) {
-                $msg_headers->addHeader('Bcc', $header['bcc']);
+                $msg_headers->addHeader('Bcc', String::convertCharset($header['bcc'], $browser_charset, $charset));
             }
 
             /* Loop through the envelope and add headers. */
@@ -1733,7 +1733,9 @@ class IMP_Compose {
             } else {
                 $msg = $msg_pre . $msg . $msg_post;
             }
-            if ($rte && $GLOBALS['prefs']->getValue('compose_html')) {
+            if ($rte &&
+                (empty($_SESSION['imp']['viewmode']) || ($_SESSION['imp']['viewmode']) != 'mimp') &&
+                $GLOBALS['prefs']->getValue('compose_html')) {
                 $msg = $this->text2html($msg);
                 $format = 'html';
             } else {
@@ -1826,7 +1828,9 @@ class IMP_Compose {
 
             if (empty($msg)) {
                 $msg = $msg_pre . $this->_rebuildMsgText($imp_contents) . $msg_post;
-                if ($rte && $GLOBALS['prefs']->getValue('compose_html')) {
+                if ($rte &&
+                    (empty($_SESSION['imp']['viewmode']) || ($_SESSION['imp']['viewmode']) != 'mimp') &&
+                    $GLOBALS['prefs']->getValue('compose_html')) {
                     $msg = $this->text2html($msg);
                     $format = 'html';
                 } else {
diff --git a/lib/Crypt/PGP.php b/lib/Crypt/PGP.php
index ca0856d..3d63a38 100644
--- a/lib/Crypt/PGP.php
+++ b/lib/Crypt/PGP.php
@@ -2,7 +2,7 @@
 /**
  * @package IMP
  *
- * $Horde: imp/lib/Crypt/PGP.php,v 1.90.2.25 2009/03/03 21:26:24 slusarz Exp $
+ * $Horde: imp/lib/Crypt/PGP.php,v 1.90.2.26 2009/05/09 12:31:20 jan Exp $
  */
 
 /** Horde_Crypt_pgp */
@@ -354,6 +354,7 @@ class IMP_PGP extends Horde_Crypt_pgp {
         }
 
         $text = '';
+        $charset = $part->getCharset();
 
         require_once 'Horde/MIME/Message.php';
 
@@ -362,6 +363,7 @@ class IMP_PGP extends Horde_Crypt_pgp {
 
         $message = new MIME_Message();
         foreach ($parts as $val) {
+            $val->setCharset($charset);
             $message->addPart($val);
         }
 
diff --git a/lib/IMAP/Client.php b/lib/IMAP/Client.php
index b0dab56..6e982d2 100644
--- a/lib/IMAP/Client.php
+++ b/lib/IMAP/Client.php
@@ -10,7 +10,7 @@ define('IMP_IMAPCLIENT_CONTINUATION', 2);
  *
  * TODO: This should eventually be moved to Horde 4.0/framework.
  *
- * $Horde: imp/lib/IMAP/Client.php,v 1.21.2.35 2009/01/06 15:24:05 jan Exp $
+ * $Horde: imp/lib/IMAP/Client.php,v 1.21.2.36 2009/08/05 08:36:37 slusarz Exp $
  *
  * Copyright 2005-2009 The Horde Project (http://www.horde.org/)
  *
@@ -249,6 +249,8 @@ class IMP_IMAPClient {
                 $ob = $ob2;
             } elseif ($ob2->type == IMP_IMAPCLIENT_UNTAGGED) {
                 $ob->message .= "\n" . $ob2->message;
+            } else {
+                $ob->response = $ob2->response;
             }
             break;
 
diff --git a/lib/IMAP/Tree.php b/lib/IMAP/Tree.php
index b5ebf31..3b91739 100644
--- a/lib/IMAP/Tree.php
+++ b/lib/IMAP/Tree.php
@@ -8,7 +8,7 @@ require_once 'Horde/Serialize.php';
  * query information about individual mailboxes.
  * In IMP, folders = IMAP mailboxes so the two terms are used interchangably.
  *
- * $Horde: imp/lib/IMAP/Tree.php,v 1.25.2.69 2009/03/10 21:11:31 slusarz Exp $
+ * $Horde: imp/lib/IMAP/Tree.php,v 1.25.2.70 2009/05/15 21:40:01 slusarz Exp $
  *
  * Copyright 2000-2009 The Horde Project (http://www.horde.org/)
  *
@@ -1522,9 +1522,10 @@ class IMP_Tree {
      */
     function _activeElt($elt)
     {
-        return ($this->_showunsub ||
-                ($this->isSubscribed($elt) && !$this->isContainer($elt)) ||
-                $this->hasChildren($elt));
+        return (!$this->isInvisible($elt) &&
+                ($this->_showunsub ||
+                 ($this->isSubscribed($elt) && !$this->isContainer($elt)) ||
+                 $this->hasChildren($elt)));
     }
 
     /**
diff --git a/lib/IMP.php b/lib/IMP.php
index 32c0e8f..7c5c1b9 100644
--- a/lib/IMP.php
+++ b/lib/IMP.php
@@ -128,7 +128,7 @@ define('IMP_IDX_SEP', "\1");
 /**
  * IMP Base Class.
  *
- * $Horde: imp/lib/IMP.php,v 1.449.4.125 2009/04/07 04:56:37 slusarz Exp $
+ * $Horde: imp/lib/IMP.php,v 1.449.4.127 2009/08/05 03:56:37 slusarz Exp $
  *
  * Copyright 1999-2009 The Horde Project (http://www.horde.org/)
  *
@@ -1347,7 +1347,7 @@ class IMP {
      */
     function appendNamespace($mbox)
     {
-        $ns_info = IMP::getNamespace($mbox, false);
+        $ns_info = IMP::getNamespace($mbox);
         if ($ns_info === null) {
             $ns_info = IMP::defaultNamespace();
         }
@@ -1435,11 +1435,13 @@ class IMP {
      *
      * @since IMP 4.2
      *
-     * @param string $default  The default encrypt option.
+     * @param string $default      The default encrypt option.
+     * @param boolean $returnList  Whether to return a hash with options
+     *                             instead of the options tag.
      *
      * @return string  The list of option tags.
      */
-    function encryptList($default = null)
+    function encryptList($default = null, $returnList = false)
     {
         if (empty($default)) {
             $default = $GLOBALS['prefs']->getValue('default_encrypt');
@@ -1462,6 +1464,10 @@ class IMP {
             $enc_options[IMP_SMIME_SIGNENC] = _("S/MIME Sign/Encrypt Message");
         }
 
+        if ($returnList) {
+            return $enc_options;
+        }
+
         $output = '';
         foreach ($enc_options as $key => $val) {
              $output .= '<option value="' . $key . '"' . (($default == $key) ? ' selected="selected"' : '') . '>' . $val . '</option>' . "\n";
diff --git a/lib/MIME/Viewer/html.php b/lib/MIME/Viewer/html.php
index 9a98942..e8ce447 100644
--- a/lib/MIME/Viewer/html.php
+++ b/lib/MIME/Viewer/html.php
@@ -6,7 +6,7 @@ require_once 'Horde/MIME/Viewer/html.php';
  * The MIME_Viewer_html class renders out HTML text with an effort to
  * remove potentially malicious code.
  *
- * $Horde: imp/lib/MIME/Viewer/html.php,v 1.75.2.39 2009/03/12 19:10:48 slusarz Exp $
+ * $Horde: imp/lib/MIME/Viewer/html.php,v 1.75.2.40 2009/07/07 22:04:51 slusarz Exp $
  *
  * Copyright 1999-2009 The Horde Project (http://www.horde.org/)
  *
@@ -30,13 +30,13 @@ class IMP_MIME_Viewer_html extends MIME_Viewer_html {
         # match 1
         (
             # <img> tags
-            <img[^>]+src=
+            <img[^>]+?src=
             # <input> tags
-            |<input[^>]*src=
+            |<input[^>]+?src=
             # "background" attributes
-            |<body[^>]*background=|<td[^>]*background=|<table[^>]*background=
+            |<body[^>]+?background=|<td[^>]*background=|<table[^>]*background=
             # "style" attributes; match 2; quotes: match 3
-            |(style=\s*("|\')?[^>]*background(?:-image)?:(?(3)[^"\']|[^>])*?url\s*\()
+            |(style=\s*("|\')?[^>]*?background(?:-image)?:(?(3)[^"\']|[^>])*?url\s*\()
         )
         # whitespace
         \s*
@@ -55,7 +55,7 @@ class IMP_MIME_Viewer_html extends MIME_Viewer_html {
         (?(2)
             # closing parenthesis
             \s*\)
-            # remainder of the "style" attribute; match 5
+            # remainder of the "style" attribute; match 6
             ((?(3)[^"\'>]*|[^\s>]*))
         )
         /isx';
diff --git a/lib/MIME/Viewer/itip.php b/lib/MIME/Viewer/itip.php
index f598e3e..1125b66 100644
--- a/lib/MIME/Viewer/itip.php
+++ b/lib/MIME/Viewer/itip.php
@@ -4,7 +4,7 @@
  * and provides an option to import the data into a calendar source,
  * if one is available.
  *
- * $Horde: imp/lib/MIME/Viewer/itip.php,v 1.37.2.45 2009/02/25 17:32:04 jan Exp $
+ * $Horde: imp/lib/MIME/Viewer/itip.php,v 1.37.2.47 2009/05/14 10:12:26 jan Exp $
  *
  * Copyright 2002-2009 The Horde Project (http://www.horde.org/)
  *
@@ -596,18 +596,18 @@ class IMP_MIME_Viewer_itip extends MIME_Viewer {
         $start = $vfb->getAttribute('DTSTART');
         if (!is_a($start, 'PEAR_Error')) {
             if (is_array($start)) {
-                $html .= '<p><strong>' . _("Start") . ':</strong> ' . strftime($prefs->getValue('date_format'), mktime(0, 0, 0, $start['month'], $start['mday'], $start['year'])) . '</p>';
+                $html .= '<p><strong>' . _("Start:") . '</strong> ' . strftime($prefs->getValue('date_format'), mktime(0, 0, 0, $start['month'], $start['mday'], $start['year'])) . '</p>';
             } else {
-                $html .= '<p><strong>' . _("Start") . ':</strong> ' . strftime($prefs->getValue('date_format'), $start) . ' ' . date($prefs->getValue('twentyFour') ? ' G:i' : ' g:i a', $start) . '</p>';
+                $html .= '<p><strong>' . _("Start:") . '</strong> ' . strftime($prefs->getValue('date_format'), $start) . ' ' . date($prefs->getValue('twentyFour') ? ' G:i' : ' g:i a', $start) . '</p>';
             }
         }
 
         $end = $vfb->getAttribute('DTEND');
         if (!is_a($end, 'PEAR_Error')) {
             if (is_array($end)) {
-                $html .= '<p><strong>' . _("End") . ':</strong> ' . strftime($prefs->getValue('date_format'), mktime(0, 0, 0, $end['month'], $end['mday'], $end['year'])) . '</p>';
+                $html .= '<p><strong>' . _("End:") . '</strong> ' . strftime($prefs->getValue('date_format'), mktime(0, 0, 0, $end['month'], $end['mday'], $end['year'])) . '</p>';
             } else {
-                $html .= '<p><strong>' . _("End") . ':</strong> ' . strftime($prefs->getValue('date_format'), $end) . ' ' . date($prefs->getValue('twentyFour') ? ' G:i' : ' g:i a', $end) . '</p>';
+                $html .= '<p><strong>' . _("End:") . '</strong> ' . strftime($prefs->getValue('date_format'), $end) . ' ' . date($prefs->getValue('twentyFour') ? ' G:i' : ' g:i a', $end) . '</p>';
             }
         }
 
@@ -772,18 +772,18 @@ class IMP_MIME_Viewer_itip extends MIME_Viewer {
         $start = $vevent->getAttribute('DTSTART');
         if (!is_a($start, 'PEAR_Error')) {
             if (is_array($start)) {
-                $html .= '<p><strong>' . _("Start") . ':</strong> ' . strftime($prefs->getValue('date_format'), mktime(0, 0, 0, $start['month'], $start['mday'], $start['year'])) . '</p>';
+                $html .= '<p><strong>' . _("Start:") . '</strong> ' . strftime($prefs->getValue('date_format'), mktime(0, 0, 0, $start['month'], $start['mday'], $start['year'])) . '</p>';
             } else {
-                $html .= '<p><strong>' . _("Start") . ':</strong> ' . strftime($prefs->getValue('date_format'), $start) . ' ' . date($prefs->getValue('twentyFour') ? ' G:i' : ' g:i a', $start) . '</p>';
+                $html .= '<p><strong>' . _("Start:") . '</strong> ' . strftime($prefs->getValue('date_format'), $start) . ' ' . date($prefs->getValue('twentyFour') ? ' G:i' : ' g:i a', $start) . '</p>';
             }
         }
 
         $end = $vevent->getAttribute('DTEND');
         if (!is_a($end, 'PEAR_Error')) {
             if (is_array($end)) {
-                $html .= '<p><strong>' . _("End") . ':</strong> ' . strftime($prefs->getValue('date_format'), mktime(0, 0, 0, $end['month'], $end['mday'], $end['year'])) . '</p>';
+                $html .= '<p><strong>' . _("End:") . '</strong> ' . strftime($prefs->getValue('date_format'), mktime(0, 0, 0, $end['month'], $end['mday'], $end['year'])) . '</p>';
             } else {
-                $html .= '<p><strong>' . _("End") . ':</strong> ' . strftime($prefs->getValue('date_format'), $end) . ' ' . date($prefs->getValue('twentyFour') ? ' G:i' : ' g:i a', $end) . '</p>';
+                $html .= '<p><strong>' . _("End:") . '</strong> ' . strftime($prefs->getValue('date_format'), $end) . ' ' . date($prefs->getValue('twentyFour') ? ' G:i' : ' g:i a', $end) . '</p>';
             }
         }
 
diff --git a/lib/MIME/Viewer/pgp.php b/lib/MIME/Viewer/pgp.php
index c1791ad..0f06774 100644
--- a/lib/MIME/Viewer/pgp.php
+++ b/lib/MIME/Viewer/pgp.php
@@ -15,7 +15,7 @@ require_once IMP_BASE . '/lib/Crypt/PGP.php';
  *   'pgp_verify_msg' -- Do verification of PGP signed data.
  *   'rawpgpkey' -- Display the PGP Public Key in raw, text format
  *
- * $Horde: imp/lib/MIME/Viewer/pgp.php,v 1.96.6.24 2009/01/06 15:24:09 jan Exp $
+ * $Horde: imp/lib/MIME/Viewer/pgp.php,v 1.96.6.26 2009/06/07 10:38:31 jan Exp $
  *
  * Copyright 2002-2009 The Horde Project (http://www.horde.org/)
  *
@@ -249,7 +249,7 @@ class IMP_MIME_Viewer_pgp extends MIME_Viewer {
                     }
                 }
             } else {
-                $this->_status[] = _("The message below does not appear to be in the correct PGP format (according to RFC 2015).");
+                $sig_result = PEAR::raiseError(_("The message below does not appear to be in the correct PGP format (according to RFC 2015)."));
             }
         } elseif ($mimetype == 'application/pgp-signature') {
             /* Get the signed message to output. */
@@ -278,16 +278,21 @@ class IMP_MIME_Viewer_pgp extends MIME_Viewer {
         }
 
         $text = $this->_outputStatus();
+        $class = '';
 
         if ($sig_result !== null) {
             $text .= $this->_outputPGPSignatureTest($sig_result);
+            if ($this->getConfigParam('highlight')) {
+                $class = ' class="' . (is_a($sig_result, 'PEAR_Error') ? 'signedinvalid' : 'signedvalid') . '"';
+            }
         }
 
         /* We need to stick the output into a MIME_Contents object. */
         $mc = new MIME_Contents($mime_message, array('download' => 'download_attach', 'view' => 'view_attach'), array(&$this->_contents));
         $mc->buildMessage();
 
-        return $text . '<table cellspacing="0">' . $mc->getMessage(true) . '</table>';
+        return $text . '<table cellspacing="0"' . $class . '>'
+            . $mc->getMessage(true) . '</table>';
     }
 
     /**
diff --git a/lib/MIME/Viewer/pkcs7.php b/lib/MIME/Viewer/pkcs7.php
index 277c495..e82435b 100644
--- a/lib/MIME/Viewer/pkcs7.php
+++ b/lib/MIME/Viewer/pkcs7.php
@@ -17,7 +17,7 @@ require_once 'Horde/MIME/Structure.php';
  * This class may add the following parameters to the URL:
  *   'smime_verify_msg' -- Do verification of S/MIME signed data.
  *
- * $Horde: imp/lib/MIME/Viewer/pkcs7.php,v 1.68.2.27 2009/01/06 15:24:09 jan Exp $
+ * $Horde: imp/lib/MIME/Viewer/pkcs7.php,v 1.68.2.28 2009/05/27 15:47:08 jan Exp $
  *
  * Copyright 2002-2009 The Horde Project (http://www.horde.org/)
  *
@@ -266,12 +266,15 @@ class IMP_MIME_Viewer_pkcs7 extends MIME_Viewer {
             $mc = new MIME_Contents($mime_message, array('download' => 'download_attach', 'view' => 'view_attach'), array(&$this->_contents));
             $mc->buildMessage();
 
-            $text .= '<table cellpadding="0" cellspacing="0">' . $mc->getMessage(true) . '</table>';
-        } else {
-            $text = $this->_outputStatus();
+            return $text . '<table cellpadding="0" cellspacing="0"'
+                . ($this->getConfigParam('highlight')
+                   ? ' class="' . ($sig_result && $sig_result->result === true ? 'signedvalid' : 'signedinvalid') . '"'
+                   : '')
+                . '>' . $mc->getMessage(true) . '</table>';
+            $text .= '<table cellspacing="0">' . $mc->getMessage(true) . '</table>';
         }
 
-        return $text;
+        return $this->_outputStatus();
     }
 
     /**
diff --git a/lib/Session.php b/lib/Session.php
index 1ca1c5a..f606645 100644
--- a/lib/Session.php
+++ b/lib/Session.php
@@ -2,7 +2,7 @@
 /**
  * Functions required to start an IMP session.
  *
- * $Horde: imp/lib/Session.php,v 1.74.2.43 2009/01/06 15:24:04 jan Exp $
+ * $Horde: imp/lib/Session.php,v 1.74.2.44 2009/05/29 22:36:50 slusarz Exp $
  *
  * Copyright 1999-2009 The Horde Project (http://www.horde.org/)
  *
@@ -188,9 +188,7 @@ class IMP_Session {
                 }
             }
 
-            /* Set the maildomain. */
-            $maildomain = $GLOBALS['prefs']->getValue('mail_domain');
-            $_SESSION['imp']['maildomain'] = ($maildomain) ? $maildomain : $args['maildomain'];
+            $_SESSION['imp']['maildomain'] = $args['maildomain'];
         }
 
         /* Determine the base protocol. */
@@ -298,6 +296,11 @@ class IMP_Session {
             $_SESSION['imp']['namespace'] = null;
         }
 
+        /* Set the maildomain. */
+        if ($maildomain = $GLOBALS['prefs']->getValue('mail_domain')) {
+            $_SESSION['imp']['maildomain'] = $maildomain;
+        }
+
         /* Set up search information for the session. */
         $GLOBALS['imp_search']->sessionSetup();
 
diff --git a/lib/version.php b/lib/version.php
index 03646b3..a246949 100644
--- a/lib/version.php
+++ b/lib/version.php
@@ -1 +1 @@
-<?php define('IMP_VERSION', 'H3 (4.3.4)') ?>
+<?php define('IMP_VERSION', 'H3 (4.3.5)') ?>
diff --git a/locale/da_DK/LC_MESSAGES/imp.mo b/locale/da_DK/LC_MESSAGES/imp.mo
index 3a38e82..0c1bb5a 100644
Binary files a/locale/da_DK/LC_MESSAGES/imp.mo and b/locale/da_DK/LC_MESSAGES/imp.mo differ
diff --git a/locale/de_DE/LC_MESSAGES/imp.mo b/locale/de_DE/LC_MESSAGES/imp.mo
index a312f3a..0749b06 100644
Binary files a/locale/de_DE/LC_MESSAGES/imp.mo and b/locale/de_DE/LC_MESSAGES/imp.mo differ
diff --git a/locale/fr_FR/LC_MESSAGES/imp.mo b/locale/fr_FR/LC_MESSAGES/imp.mo
index 6c03abf..81f0522 100644
Binary files a/locale/fr_FR/LC_MESSAGES/imp.mo and b/locale/fr_FR/LC_MESSAGES/imp.mo differ
diff --git a/locale/it_IT/LC_MESSAGES/imp.mo b/locale/it_IT/LC_MESSAGES/imp.mo
index a63ace6..18d3047 100644
Binary files a/locale/it_IT/LC_MESSAGES/imp.mo and b/locale/it_IT/LC_MESSAGES/imp.mo differ
diff --git a/locale/pt_BR/LC_MESSAGES/imp.mo b/locale/pt_BR/LC_MESSAGES/imp.mo
index e6a7a8b..386282c 100644
Binary files a/locale/pt_BR/LC_MESSAGES/imp.mo and b/locale/pt_BR/LC_MESSAGES/imp.mo differ
diff --git a/locale/ru_RU/LC_MESSAGES/imp.mo b/locale/ru_RU/LC_MESSAGES/imp.mo
index bfee1ab..9c9d2fa 100644
Binary files a/locale/ru_RU/LC_MESSAGES/imp.mo and b/locale/ru_RU/LC_MESSAGES/imp.mo differ
diff --git a/po/da_DK.po b/po/da_DK.po
index 2f85e22..adbe617 100644
--- a/po/da_DK.po
+++ b/po/da_DK.po
@@ -1,58 +1,72 @@
-# Danish translations for IMP package
-# Danske oversættelser for pakke IMP.
-# Copyright 2001-2009 The Horde Project
-# This file is distributed under the same license as the IMP package.
-# Martin List-Petersen <martin at list-petersen.dk>, 2001.
-# Brian Truelsen <horde+i18n at briantruelsen.dk>, 2005-2006..
+# Danish translations for horde package
+# Danske oversættelser for pakke horde.
+# Copyright (C) 2009 Horde Project
+# This file is distributed under the same license as the horde package.
+# Niels Baggesen <nba at users.sourceforge.net>, 2009.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Imp H3 (4.2-cvs)\n"
+"Project-Id-Version: horde 33\n"
 "Report-Msgid-Bugs-To: dev at lists.horde.org\n"
-"POT-Creation-Date: 2006-03-11 12:34+0100\n"
-"PO-Revision-Date: 2006-03-11 13:47+0100\n"
-"Last-Translator: Brian Truelsen <horde+i18n at briantruelsen.dk>\n"
+"POT-Creation-Date: 2009-06-15 19:54+0200\n"
+"PO-Revision-Date: 2009-04-26 23:32+0200\n"
+"Last-Translator: Niels Baggesen <nba at users.sourceforge.net>\n"
 "Language-Team: i18n at lists.horde.org\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: lib/Compose.php:1552
+#: lib/Compose.php:1980
 msgid "      Cc: "
 msgstr "      Cc: "
 
-#: lib/Compose.php:1549
+#: lib/Compose.php:1977
 msgid "      To: "
 msgstr "      Til: "
 
-#: lib/Compose.php:1537
+#: lib/Compose.php:1965
 msgid "    Date: "
 msgstr "    Dato: "
 
-#: lib/Compose.php:1540
+#: lib/Compose.php:1968
 msgid "    From: "
 msgstr "    Fra: "
 
-#: folders.php:279 mailbox.php:330
+#: folders.php:359 mailbox.php:357
 #, php-format
 msgid " (Accesskey %s)"
 msgstr " (Accesskey %s)"
 
-#: lib/Compose.php:1546
+#: lib/Compose.php:1974
 msgid " Subject: "
 msgstr " Emne: "
 
-#: mailbox.php:560
+#: mailbox.php:577
 msgid "#"
 msgstr "#"
 
-#: thread.php:153
+#: lib/Quota.php:73
+#, php-format
+msgid "%.0f MB"
+msgstr "%.0f MB"
+
+#: lib/Quota.php:67
+#, php-format
+msgid "%.0f%% of %.0f MB"
+msgstr "%.0f%% af %.0f MB"
+
+#: folders.php:300 folders.php:311 lib/Message.php:863
+#, php-format
+msgid "%.2fMB"
+msgstr "%.2fMB"
+
+#: thread.php:158
 #, php-format
 msgid "%d Messages"
 msgstr "%d beskeder"
 
-#: lib/Spam.php:219
+#: lib/Spam.php:224
 #, php-format
 msgid "%d messages have been deleted."
 msgstr "%d beskeder er blevet slettet."
@@ -80,188 +94,182 @@ msgstr ""
 msgid "%d messages have been reported as spam."
 msgstr "%d beskeder er blevet indberettet som spam."
 
-#: mailbox.php:280
+#: mailbox.php:265
 #, php-format
 msgid "%d to %d of %d Messages"
 msgstr "%d til %d af %d beskeder"
 
-#: lib/MIME/Contents.php:570
-#, php-format
-msgid "%s Attachments, %s"
-msgstr "%s bilag, %s"
-
-#: mailbox.php:793 lib/MIME/Contents.php:560
+#: lib/UI/Mailbox.php:137
 #, php-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: mailbox.php:791 lib/MIME/Contents.php:558
+#: lib/UI/Mailbox.php:135
 #, php-format
 msgid "%s MB"
 msgstr "%s MB"
 
-#: lib/Maintenance/Task/rename_sentmail_monthly.php:44
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:39
 #, php-format
 msgid "%s already exists. Your %s folder was not renamed."
 msgstr "%s findes allerede. Mappen %s blev ikke omdøbt."
 
-#: lib/MIME/Contents.php:563
-#, php-format
-msgid "%s bytes"
-msgstr "%s byte"
-
-#: lib/Message.php:738
-#, php-format
-msgid "%s does not appear to be a valid mailbox."
-msgstr "%s synes ikke at være en gyldig brevbakke."
-
-#: lib/Maintenance/Task/rename_sentmail_monthly.php:42
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:37
 #, php-format
 msgid "%s folder being renamed at the start of the month."
 msgstr "Mappen %s vil blive omdøbt i starten af hver måned."
 
-#: lib/MIME/Viewer/itip.php:260
+#: lib/api.php:188 lib/api.php:191 lib/api.php:196
+#, php-format
+msgid "%s for %s"
+msgstr "%s for %s"
+
+#: lib/MIME/Viewer/itip.php:283
 #, php-format
 msgid "%s has accepted."
 msgstr "%s har accepteret."
 
-#: lib/MIME/Viewer/itip.php:624
+#: lib/MIME/Viewer/itip.php:744
 #, php-format
 msgid "%s has cancelled \"%s\"."
 msgstr "%s har aflyst \"%s\"."
 
-#: lib/MIME/Viewer/itip.php:266
+#: lib/MIME/Viewer/itip.php:749
+#, php-format
+msgid "%s has cancelled an instance of the recurring \"%s\"."
+msgstr "%s har aflyst een af de gentagne \"%s\"."
+
+#: lib/MIME/Viewer/itip.php:289
 #, php-format
 msgid "%s has declined."
 msgstr "%s har nægtet."
 
-#: lib/MIME/Viewer/itip.php:499
+#: lib/MIME/Viewer/itip.php:584
 #, php-format
 msgid "%s has replied to a free/busy request."
 msgstr "%s har svaret på en ledig/optaget-anmodning."
 
-#: lib/MIME/Viewer/itip.php:616
+#: lib/MIME/Viewer/itip.php:735
 #, php-format
 msgid "%s has replied to the invitation to \"%s\"."
 msgstr "%s har svaret på invitation til \"%s\"."
 
-#: lib/MIME/Viewer/itip.php:490
+#: lib/MIME/Viewer/itip.php:575
 #, php-format
 msgid "%s has sent you free/busy information."
 msgstr "%s har sendt ledig/optaget-information til dig."
 
-#: lib/MIME/Viewer/itip.php:272
+#: lib/MIME/Viewer/itip.php:295
 #, php-format
 msgid "%s has tentatively accepted."
 msgstr "%s har accepteret tentativt."
 
-#: lib/MIME/Viewer/itip.php:495
+#: lib/Spam.php:270
+#, php-format
+msgid "%s report from %s"
+msgstr "%s rapport fra %s"
+
+#: lib/MIME/Viewer/itip.php:580
 #, php-format
 msgid "%s requests your free/busy information."
 msgstr "%s anmoder om dine ledig/optaget-informationer."
 
-#: lib/MIME/Viewer/itip.php:587
+#: lib/MIME/Viewer/itip.php:706
 #, php-format
 msgid "%s requests your presence at \"%s\"."
 msgstr "%s anmoder om din tilstedeværelse ved \"%s\"."
 
-#: lib/Message.php:489
+#: lib/MIME/Viewer/itip.php:686
+#, php-format
+msgid "%s wants to notify you about changes of \"%s\"."
+msgstr "%s ønsker at gøre dig opmærksom ændringerne til \"%s\"."
+
+#: lib/Message.php:470
 #, php-format
 msgid "%s was successfully added to \"%s\"."
 msgstr "%s er succesfuldt blevet tilføjet til \"%s\"."
 
-#: lib/MIME/Viewer/itip.php:599
+#: lib/MIME/Viewer/itip.php:723
 #, php-format
 msgid "%s wishes to ammend \"%s\"."
 msgstr "%s ønsker at justere \"%s\"."
 
-#: lib/MIME/Viewer/itip.php:578 lib/MIME/Viewer/itip.php:765
+#: lib/MIME/Viewer/itip.php:675 lib/MIME/Viewer/itip.php:707
+#: lib/MIME/Viewer/itip.php:894
 #, php-format
 msgid "%s wishes to make you aware of \"%s\"."
 msgstr "%s ønsker at gøre dig opmærksom på \"%s\"."
 
-#: lib/MIME/Viewer/itip.php:603
+#: lib/MIME/Viewer/itip.php:730
 #, php-format
 msgid "%s wishes to receive the latest information about \"%s\"."
 msgstr "%s ønsker at modtage seneste information om \"%s\"."
 
-#: message.php:250 message.php:255
+#: compose.php:1228
+#, php-format
+msgid "%s%% of allowed size"
+msgstr "%s%% af den tilladte størrelse"
+
+#: message.php:282 message.php:287 message.php:505
 #, php-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: message.php:495
+#: lib/Compose.php:1909
 #, php-format
-msgid "%s: %s (%d&nbsp;of&nbsp;%d)"
-msgstr "%s: %s (%d&nbsp;af&nbsp;%d)"
+msgid "%u Forwarded Messages"
+msgstr "%u videresendte beskeder"
 
-#: templates/compose/spelling.html:73
-msgid "(Apply these changes and move to next screen.)"
-msgstr "(Godkend ændringerne og gå til næste skærm.)"
+#: rss.php:87
+#, php-format
+msgid "%u of %u messages in %s unread."
+msgstr "%u af %u beskeder i %s ikke læst."
 
-#: templates/compose/spelling.html:60
-msgid "(Discard all changes and return to the compose screen.)"
-msgstr "(Annuller alle ændringer og gå tilbage til skrivningsvinduet.)"
+#: message.php:506
+#, php-format
+msgid "(%d&nbsp;of&nbsp;%d)"
+msgstr "(%d&nbsp;af&nbsp;%d)"
 
-#: templates/stationery/prefs.inc:16
+#: stationery.php:129
 msgid "(HTML)"
 msgstr "(HTML)"
 
-#: templates/stationery/prefs.inc:16
+#: stationery.php:129
 msgid "(Plain Text)"
 msgstr "(Ren tekst)"
 
-#: spelling.php:249
-msgid ""
-"(Return to the compose screen after applying all changes made thus far.  "
-"Changes on the current screen will NOT be applied.)"
-msgstr ""
-"(Gå tilbage til skrivningsvinduet efter at have gemt ændringer lavet indtil "
-"nu. Ændringer på den aktuelle side vil ikke blive gemt.)"
-
-#: spelling.php:246
-msgid ""
-"(Send message after applying all changes made thus far.  Changes on the "
-"current screen will NOT be applied.)"
-msgstr ""
-"(Send besked efter at have gemt ændringer lavet indtil nu. Ændringer på den "
-"aktuelle side vil ikke blive gemt.)"
-
-#: templates/contacts/contacts.html:47
+#: templates/contacts/contacts.html:49
 msgid "* Add these by clicking OK *"
 msgstr "* Tilføj disse ved at clicke OK *"
 
-#: templates/contacts/contacts.html:32
+#: templates/contacts/contacts.html:33
 msgid "* Please select address(es) *"
 msgstr "* Vælg venligst adresse(r) *"
 
-#: lib/MIME/Contents.php:568
-#, php-format
-msgid "1 Attachment, %s"
-msgstr "1 bilag, %s"
-
-#: config/prefs.php.dist:881
+#: config/prefs.php.dist:1104
 msgid "100 characters"
 msgstr "100 tegn"
 
-#: config/prefs.php.dist:884
+#: config/prefs.php.dist:1107
 msgid "1000 characters"
 msgstr "1000 tegn"
 
-#: config/prefs.php.dist:882
+#: config/prefs.php.dist:1105
 msgid "250 characters"
 msgstr "250 tegn"
 
-#: config/prefs.php.dist:883
+#: config/prefs.php.dist:1106
 msgid "500 characters"
 msgstr "500 tegn"
 
-#: lib/MIME/Viewer/images.php:163
+#: lib/MIME/Viewer/pdf.php:84
 #, php-format
-msgid "A large image named %s is attached to this message."
-msgstr "Et stor billede benævnt %s er hæftet ved denne besked."
+msgid "A PDF file named %s is attached to this message. A thumbnail is below."
+msgstr ""
+"En PDF fil benævnt %s er hæftet ved denne besked. Der er en miniature "
+"nedenfor."
 
-#: lib/MIME/Viewer/notification.php:50
+#: lib/MIME/Viewer/notification.php:49
 msgid ""
 "A message you have sent has resulted in a return notification from the "
 "recipient."
@@ -269,74 +277,81 @@ msgstr ""
 "En besked, som du har sendt, har resulteret i \"return notification\" fra "
 "modtageren."
 
-#: templates/javascript/src/popup.js:58
+#: templates/javascript_defs.php:67
 msgid ""
 "A popup window could not be opened. Perhaps you have set your browser to "
 "block popup windows?"
 msgstr "Et vindue kunne ikke åbnes.  Er din popup-blokker aktiveret?"
 
-#: templates/javascript/popup.js:9
-msgid ""
-"A popup window could not be opened.Perhaps you have set your browser to "
-"block popup windows?"
-msgstr "Et vindue kunne ikke åbnes.  Er din popup-blokker aktiveret?"
-
-#: templates/search/search.html:64
+#: templates/search/search.html:61
 msgid "AND"
 msgstr "OG"
 
-#: config/prefs.php.dist:755
+#: config/prefs.php.dist:665
+msgid "About this editor"
+msgstr "Om denne editor"
+
+#: config/prefs.php.dist:973
 msgid "Above the message text"
 msgstr "Over brødtekst"
 
-#: lib/MIME/Viewer/itip.php:589
+#: lib/MIME/Viewer/itip.php:713
 msgid "Accept and add to my calendar"
 msgstr "Acceptér anmodning og tilføj til min kalender"
 
-#: lib/MIME/Viewer/itip.php:592
+#: lib/MIME/Viewer/itip.php:710
+msgid "Accept and update in my calendar"
+msgstr "Acceptér og opdater min kalender"
+
+#: lib/MIME/Viewer/itip.php:716
 msgid "Accept request"
 msgstr "Acceptér anmodning"
 
-#: lib/MIME/Viewer/itip.php:876
+#: lib/MIME/Viewer/itip.php:1009
 msgid "Accepted"
 msgstr "Accepteret"
 
-#: lib/MIME/Viewer/itip.php:261
+#: lib/MIME/Viewer/itip.php:284
 msgid "Accepted: "
 msgstr "Accepteret: "
 
-#: lib/MIME/Viewer/itip.php:529 lib/MIME/Viewer/itip.php:732
-#: lib/MIME/Viewer/itip.php:855
+#: templates/fetchmail/fetchmailprefs.html:43
+msgid "Account's name:"
+msgstr "Kontonavn:"
+
+#: lib/MIME/Viewer/itip.php:618 lib/MIME/Viewer/itip.php:856
+#: lib/MIME/Viewer/itip.php:857 lib/MIME/Viewer/itip.php:988
 msgid "Actions"
 msgstr "Handlinger"
 
-#: lib/MIME/Headers.php:201 lib/MIME/Headers.php:202
+#: lib/MIME/Headers.php:219 lib/MIME/Headers.php:220 lib/MIME/Headers.php:242
+#: lib/MIME/Headers.php:243
 #, php-format
 msgid "Add %s to my Address Book"
 msgstr "Tilføj %s til mit adressekartotek"
 
-#: templates/prefs/sourceselect.inc:303
+#: templates/prefs/sourceselect.inc:300
 msgid "Add source"
 msgstr "Tilføj kilde"
 
-#: lib/MIME/Viewer/itip.php:580
+#: lib/MIME/Viewer/itip.php:677
 msgid "Add this to my calendar"
 msgstr "Føj til kalender"
 
-#: lib/MIME/Viewer/itip.php:767
+#: lib/MIME/Viewer/itip.php:896
 msgid "Add this to my tasklist"
 msgstr "Føj denne til min opgaveliste"
 
-#: lib/MIME/Viewer/itip.php:590
+#: lib/MIME/Viewer/itip.php:714
 msgid "Add to my calendar"
 msgstr "Føj til min kalender"
 
-#: compose.php:335
+#: lib/Compose.php:2954
 #, php-format
 msgid "Added \"%s\" as an attachment."
 msgstr "Tilføjet \"%s\" som vedhæftelse."
 
-#: config/prefs.php.dist:202
+#: config/prefs.php.dist:950
 msgid ""
 "Additional headers to display when viewing: <em>(optional, enter each header "
 "on a new line)</em>"
@@ -344,43 +359,47 @@ msgstr ""
 "Yderligere felter der vises under læsning: <em>(valgfri, et felt pr. linie)</"
 "em>"
 
-#: lib/MIME/Viewer/notification.php:61
+#: lib/MIME/Viewer/notification.php:60
 #, php-format
 msgid "Additional information can be viewed %s."
 msgstr "Yderligere information kan ses %s."
 
-#: lib/MIME/Viewer/notification.php:61
+#: lib/MIME/Viewer/notification.php:60
 msgid "Additional information details"
 msgstr "Yderligere besked-detailer"
 
-#: lib/MIME/Viewer/status.php:93
+#: lib/MIME/Viewer/status.php:92
 msgid "Additional message details"
 msgstr "Yderligere besked-detaljer"
 
-#: lib/MIME/Viewer/status.php:92
+#: lib/MIME/Viewer/status.php:91
 #, php-format
 msgid "Additional message details can be viewed %s."
 msgstr "Yderligere besked-detaljer kan ses %s."
 
-#: lib/MIME/Viewer/status.php:78
+#: lib/MIME/Viewer/status.php:77
 msgid "Additional message error details"
 msgstr "Yderligere detaljer om besked-fejl"
 
-#: lib/MIME/Viewer/status.php:77
+#: lib/MIME/Viewer/status.php:76
 #, php-format
 msgid "Additional message error details can be viewed %s."
 msgstr "Yderligere detaljer om besked-fejl can ses %s."
 
-#: compose.php:864 compose.php:1227 contacts.php:77
+#: compose.php:825 compose.php:1071 contacts.php:120
 #: templates/contacts/contacts.html:8
 msgid "Address Book"
 msgstr "Adressekartotek"
 
-#: config/prefs.php.dist:138
+#: config/prefs.php.dist:168
 msgid "Address Books"
 msgstr "Adressekartoteker"
 
-#: config/prefs.php.dist:193
+#: templates/prefs/sourceselect.inc:345
+msgid "Address book to add addresses to"
+msgstr "Adressekartotek, der skal tilføjes til "
+
+#: config/prefs.php.dist:223
 msgid ""
 "Addresses to BCC all messages: <em>(optional, enter each address on a new "
 "line)</em>"
@@ -388,7 +407,7 @@ msgstr ""
 "BCC alle beskeder til disse adresser: <em>(valgfri, én adresse pr. linie)</"
 "em>"
 
-#: config/prefs.php.dist:185
+#: config/prefs.php.dist:215
 msgid ""
 "Addresses to explicitly tie to this identity: <em>(optional, enter each "
 "address on a new line)</em>"
@@ -396,11 +415,15 @@ msgstr ""
 "Adresser, som eksplicit knyttes til denne identitet: <em>(valgfri, én "
 "adresse pr. linie)</em>"
 
-#: templates/mailbox/navbar.html:7
+#: lib/IMAP/ACL/rfc2086.php:57 lib/IMAP/ACL/rfc4314.php:59
+msgid "Administer"
+msgstr "Administrer"
+
+#: templates/mailbox/navbar.html:10
 msgid "All"
 msgstr "Alle"
 
-#: lib/Maintenance/Task/purge_sentmail.php:84
+#: lib/Maintenance/Task/purge_sentmail.php:82
 #, php-format
 msgid ""
 "All messages in the folder(s) \"%s\" older than %s days will be permanently "
@@ -409,14 +432,15 @@ msgstr ""
 "Alle beskeder i din(e) \"%s\"-mappe(r), som er ældre end %s dage vil blive "
 "slettet."
 
-#: templates/javascript/folders.js:20 templates/javascript/src/folders.js:117
+#: templates/javascript_defs.php:57
 msgid ""
 "All messages in the following folder(s) will be downloaded into one MBOX "
 "file:"
 msgstr ""
 "Alle beskeder i de følgende mappe(r) vil blive gemt i en enkelt MBOX fil:"
 
-#: lib/Maintenance/Task/purge_trash.php:80
+#: lib/Maintenance/Task/purge_spam.php:79
+#: lib/Maintenance/Task/purge_trash.php:78
 #, php-format
 msgid ""
 "All messages in your \"%s\" folder older than %s days will be permanently "
@@ -431,38 +455,38 @@ msgstr ""
 "Alle gamle refererede vedhæftelser, der er ældre end %s måneder vil blive "
 "slettet."
 
-#: lib/Maintenance/Task/delete_sentmail_monthly.php:73
+#: lib/Maintenance/Task/delete_sentmail_monthly.php:72
 #, php-format
 msgid "All old sent-mail folders more than %s months old will be deleted."
 msgstr ""
 "Alle gamle, sendte beskeder, der er ældre end %s måneder, vil blive slettet."
 
-#: acl.php:85
+#: acl.php:88 acl.php:129
 #, php-format
 msgid "All rights on folder \"%s\" successfully removed for user \"%s\"."
 msgstr "Alle rettigheder til mappen \"%s\" er blev fjernet for bruger \"%s\"."
 
-#: lib/api.php:81
+#: lib/api.php:100
 msgid "Allow Folder Creation?"
 msgstr "Tillad oprettelse af mapper?"
 
-#: filterprefs.php:97
+#: filterprefs.php:111
 msgid "Allow filter rules to be applied in any mailbox?"
 msgstr "Tillad at filter-regler påføres vilkårlige brevbakker?"
 
-#: lib/MIME/Viewer/alternative.php:80
+#: lib/MIME/Viewer/alternative.php:79
 msgid "Alternative parts for this section:"
 msgstr "Alternative dele til dette afsnit:"
 
-#: config/prefs.php.dist:635
+#: config/prefs.php.dist:730
 msgid "Always"
 msgstr "Altid"
 
-#: config/prefs.php.dist:620
+#: config/prefs.php.dist:715
 msgid "Always save attachments"
 msgstr "Gem altid vedhæftelser."
 
-#: lib/Message.php:579
+#: lib/Message.php:581
 msgid ""
 "An error occured while attempting to strip the attachment. The IMAP server "
 "said: "
@@ -470,300 +494,364 @@ msgstr ""
 "En fejl opstod under forsøget på at skrælle vedhæftelsen af. IMAP-serveren "
 "meldte: "
 
-#: lib/Message.php:463
+#: lib/MIME/Viewer/images.php:148
+#, php-format
+msgid "An image named %s is attached to this message. A thumbnail is below."
+msgstr ""
+"Et billede benævnt %s er hæftet ved denne besked. Der er en miniature "
+"nedenfor."
+
+#: lib/Message.php:444
 msgid "An unknown error occured while creating the new note."
 msgstr "Der skete en ukendt fejl under tilføjelsen af det nye notits."
 
-#: lib/Message.php:462
+#: lib/Message.php:443
 msgid "An unknown error occured while creating the new task."
 msgstr "Der skete en ukendt fejl under tilføjelsen af det nye opgave."
 
-#: mailbox.php:827 mailbox.php:980 message.php:469
-#: templates/message/navbar_navigate.html:9 templates/mailbox/legend.html:4
-#: templates/mailbox/navbar.html:15 templates/mailbox/navbar.html:30
+#: lib/MIME/Viewer/itip.php:882
+msgid "An unknown person"
+msgstr "En ukendt person"
+
+#: mailbox.php:764 message.php:477 templates/message/navbar_navigate.html:12
+#: templates/mailbox/navbar.html:18 templates/mailbox/navbar.html:34
 msgid "Answered"
 msgstr "Besvaret"
 
-#: search.php:339
+#: lib/Search.php:797
 msgid "Answered messages"
 msgstr "Besvarede beskeder"
 
-#: mailbox.php:350
+#: mailbox.php:419
 msgid "Apply Filters"
 msgstr "Påfør filtre"
 
-#: mailbox.php:350
+#: mailbox.php:419
 #, php-format
 msgid "Apply Filters to %s"
 msgstr "Påfør \"%s\" filtre"
 
-#: filterprefs.php:95
+#: filterprefs.php:108
 msgid "Apply filter rules upon logging on?"
 msgstr "Påfør filtre, når du logger ind."
 
-#: filterprefs.php:96
+#: filterprefs.php:109
 msgid "Apply filter rules whenever Inbox is displayed?"
 msgstr "Påfør filterregler, når din indbakke bliver vist?"
 
-#: mailbox.php:361
+#: filterprefs.php:110
+msgid "Apply filter rules whenever sidebar is refreshed?"
+msgstr "Påfør filterregler, når dit sidepanel bliver opdateret?"
+
+#: thread.php:170
+msgid "Are you sure you want to delete all messages in this thread?"
+msgstr "Er du sikker på, at du vil slette alle beskeder i denne tråd?"
+
+#: mailbox.php:428
 msgid "Are you sure you want to delete this Virtual Folder Definition?"
 msgstr "Er du sikker på, at du vil slette denne Virtuel Mappe-definition?"
 
-#: pgp.php:370 smime.php:296
+#: pgp.php:419 smime.php:320
 msgid "Are you sure you want to delete this public key?"
 msgstr "Er du sikker på, at du vil slette denne offentlige nøgle?"
 
-#: pgp.php:400 smime.php:322
+#: pgp.php:451 smime.php:348
 msgid ""
 "Are you sure you want to delete your keypair? (This is NOT recommended!)"
 msgstr ""
 "Er du sikker på, at du vil slette dit nøglepar? (Dette kan IKKE anbefales!)"
 
-#: templates/javascript/compose.js:2 templates/javascript/src/compose.js:12
+#: templates/javascript_defs.php:29
 msgid "Are you sure you want to do this?"
 msgstr "Er du SIKKER, at du vil fortsætte?"
 
-#: message.php:541 templates/javascript/mailbox.js:19
-#: templates/javascript/src/mailbox.js:87
+#: message.php:684
+msgid "Are you sure you wish to PERMANENTLY delete all attachments?"
+msgstr "Er du sikker, at du vil PERMANENT slette alle vedhæftelser?"
+
+#: message.php:554 templates/javascript_defs.php:41
 msgid "Are you sure you wish to PERMANENTLY delete these messages?"
 msgstr "Er du sikker, at du vil slette disse beskeder PERMANENT?"
 
-#: lib/MIME/Contents.php:252
+#: lib/MIME/Contents.php:273
 msgid "Are you sure you wish to PERMANENTLY delete this attachment?"
 msgstr "Er du sikker, at du vil PERMANENT slette denne vedhæftelser?"
 
-#: mailbox.php:464
-msgid "Are you sure you wish to empty this folder?"
+#: mailbox.php:424
+msgid "Are you sure you wish to delete all mail in this folder?"
 msgstr "Er du sikker, at du vil tømme denne mappe?"
 
-#: lib/IMP.php:812
+#: lib/IMP.php:859
 msgid "Are you sure you wish to empty your spam folder?"
 msgstr "Er du sikker, at du vil tømme din spam-mappe?"
 
-#: lib/IMP.php:802
+#: lib/IMP.php:851
 msgid "Are you sure you wish to empty your trash folder?"
 msgstr "Er du sikker, at du vil tømme din skraldespand?"
 
-#: mailbox.php:463
+#: mailbox.php:508
 msgid "Are you sure you wish to permanently delete these messages?"
 msgstr "Er du sikker på, at du vil slette disse beskeder permanent?"
 
-#: templates/javascript/mailbox.js:20 templates/javascript/message.js:8
-#: templates/javascript/src/mailbox.js:98
-#: templates/javascript/src/message.js:43
+#: templates/javascript_defs.php:75
 msgid "Are you sure you wish to report this message as innocent?"
 msgstr "Er du sikker, at du vil indrapportere denne besked som harmløs?"
 
-#: templates/javascript/mailbox.js:19 templates/javascript/message.js:7
-#: templates/javascript/src/mailbox.js:93
-#: templates/javascript/src/message.js:38
+#: templates/javascript_defs.php:74
 msgid "Are you sure you wish to report this message as spam?"
 msgstr "Er du sikker, at du vil indberettet denne besked som spam?"
 
-#: config/prefs.php.dist:977
+#: config/prefs.php.dist:1200
 msgid "Arrival Time"
 msgstr "Modtaget"
 
-#: config/prefs.php.dist:992
+#: config/prefs.php.dist:1215
 msgid "Ascending"
 msgstr "Stigende"
 
-#: config/prefs.php.dist:634
+#: config/prefs.php.dist:729
 msgid "Ask"
 msgstr "Spørg"
 
-#: compose.php:1297
+#: compose.php:1166
 msgid "Attach Files"
 msgstr "Vedhæft filer"
 
-#: compose.php:1289
-msgid "Attach a copy of your PGP public key to your message?"
+#: compose.php:1155
+msgid "Attach a copy of your PGP public key to the message?"
 msgstr "Hæft en kopi af din offentlige PGP-nøgle ved din besked?"
 
-#: lib/MIME/Viewer/tnef.php:111
+#: compose.php:1160
+msgid "Attach your contact information to the message?"
+msgstr "Vedlæg dine kontaktinformationer til beskeden?"
+
+#: lib/MIME/Viewer/tnef.php:110
 msgid "Attached File:"
 msgstr "Vedhæftet fil:"
 
-#: lib/Compose.php:1585 lib/Compose.php:1681
+#: lib/Compose.php:2013 lib/Compose.php:2119
 #, php-format
 msgid ""
 "Attached file \"%s\" exceeds the attachment size limits. File NOT attached."
 msgstr ""
 "Størrelse af filen \"%s\" overstiger begrænsningen. Filen IKKE vedhæftet."
 
-#: lib/MIME/Viewer/itip.php:380
+#: lib/MIME/Viewer/itip.php:411
 msgid "Attached is a reply to a calendar request you sent."
 msgstr "Der er vedhæftet et svar til en kalender-anmodning, som du har sendt."
 
-#: mailbox.php:992 templates/javascript/compose.js:28
-#: templates/javascript/src/compose.js:249 templates/mailbox/legend.html:14
-#: templates/compose/compose.html:271 templates/compose/compose.html:327
+#: templates/javascript_defs.php:36 templates/compose/compose.html:276
+#: templates/compose/compose.html:335
 msgid "Attachment"
 msgstr "Vedhæftelse"
 
-#: attachment.php:70
+#: attachment.php:73
 #, php-format
 msgid "Attachment %s deleted."
 msgstr "Vedhæftelse %s slettet."
 
-#: lib/Compose.php:2251
+#: lib/Compose.php:2642
 msgid "Attachment Information"
 msgstr "Information om vedhæftelse"
 
-#: lib/Compose.php:635 lib/Message.php:541
+#: lib/Compose.php:816
 msgid "Attachment stripped: Original attachment type"
 msgstr "Vedhæftelsen taget af: Oprindelig type af vedhæng"
 
-#: compose.php:1238 lib/Compose.php:2219 templates/compose/compose.html:244
+#: compose.php:1104 lib/Compose.php:2609 templates/compose/compose.html:252
 msgid "Attachments"
 msgstr "Vedhæftelser"
 
-#: lib/MIME/Viewer/itip.php:685 lib/MIME/Viewer/itip.php:808
+#: lib/MIME/Viewer/itip.php:808 lib/MIME/Viewer/itip.php:937
 msgid "Attendees"
 msgstr "Deltagere"
 
-#: lib/MIME/Viewer/notification.php:53
+#: lib/MIME/Viewer/notification.php:52
 msgid "Attention"
 msgstr "Bemærk"
 
-#: lib/Auth/imp.php:44
+#: lib/Auth/imp.php:33
 msgid "Auth_imp: Required IMAP extension not found."
-msgstr "Auth_imp: Krævet IMAP udviddelse ikke fundet."
+msgstr "Auth_imp: Krævet IMAP udvidelse ikke fundet."
+
+#: config/hooks.php.dist:560
+msgid "Authentication failed."
+msgstr "Ægtning fejlede"
 
-#: config/prefs.php.dist:691
+#: config/prefs.php.dist:882
 msgid ""
-"Automatically show images in HTML messages when the sender is in my "
-"addressbook?"
+"Automatically show images in HTML messages when the sender is in my address "
+"book?"
 msgstr ""
 "Skal billeder i HTML-beskeder vises automatisk, hvis afsenderen står i mit "
 "adressekartotek?"
 
-#: templates/prefs/sourceselect.inc:298
+#: templates/prefs/sourceselect.inc:293 templates/prefs/sourceselect.inc:295
 msgid "Available Address books:"
 msgstr "Adressekartoteker, der står til rådighed:"
 
-#: lib/MIME/Viewer/itip.php:721 lib/MIME/Viewer/itip.php:844
+#: lib/MIME/Viewer/itip.php:841 lib/MIME/Viewer/itip.php:973
 msgid "Awaiting Response"
 msgstr "Afventer reaktion"
 
-#: message.php:514
+#: message.php:524 thread.php:137
 #, php-format
 msgid "Bac_k to %s"
 msgstr "Tilbage til %s"
 
-#: message.php:514 thread.php:135
+#: message.php:524 thread.php:137
 #, php-format
 msgid "Back to %s"
 msgstr "Tilbage til %s"
 
-#: thread.php:132
+#: thread.php:134
 msgid "Back to Multiple Message View Index"
 msgstr "Tilbage til oversigtsvisning"
 
-#: thread.php:130
+#: thread.php:132
 msgid "Back to Thread Display"
 msgstr "Tilbage til tråd-visning"
 
-#: lib/IMAP/Client.php:572
+#: config/prefs.php.dist:631
+msgid "Background Color"
+msgstr "Baggrundsfarve"
+
+#: lib/IMAP/Client.php:478
 #, php-format
 msgid "Bad login name or password."
 msgstr "Forkert brugernavn eller kodeord."
 
-#: lib/IMAP/Client.php:387
+#: lib/IMAP/Client.php:195
 #, php-format
 msgid "Bad or malformed request. Server Responded: %s"
 msgstr "Dårlig eller ringe formuleret anmodning. Serveren reagerede med: %s"
 
-#: lib/IMAP/Client.php:576
+#: lib/IMAP/Client.php:482
 #, php-format
-msgid "Bad request: %s."
+msgid "Bad request: %s"
 msgstr "Dårlig anmodning: %s."
 
-#: message.php:231 lib/Search.php:618 templates/login/recompose.html:32
-#: templates/contacts/contacts.html:42
+#: lib/Search.php:726 lib/UI/Message.php:28 templates/login/recompose.html:32
+#: templates/contacts/contacts.html:43
 msgid "Bcc"
 msgstr "Bcc"
 
-#: lib/MIME/Viewer/status.php:163
+#: config/prefs.php.dist:685
+msgid "Before Signature"
+msgstr "Før signatur"
+
+#: lib/MIME/Viewer/status.php:160
 msgid "Below is the raw text of the status information message."
 msgstr "Nedenfor forefindes råteksten af status beskeden."
 
-#: config/prefs.php.dist:756
+#: config/prefs.php.dist:974
 msgid "Below the message text"
 msgstr "Under brødteksten"
 
-#: mailbox.php:490 message.php:569
+#: mailbox.php:526 message.php:580
 msgid "Blacklist"
 msgstr "Blackliste"
 
-#: config/prefs.php.dist:680
+#: config/prefs.php.dist:871
 msgid "Block images in HTML messages unless they are specifically requested?"
 msgstr "Blokér billeder i HTML-beskeder med mindre de anmodes specifikt?"
 
-#: lib/Search.php:626
+#: lib/Search.php:736
 msgid "Body"
 msgstr "Besked"
 
-#: search.php:336 search.php:341 search.php:346 search.php:351
-msgid "Both"
-msgstr "Begge"
+#: message.php:570 config/prefs.php.dist:764
+msgid "Body Text Only"
+msgstr "Kun beskedtekst"
 
-#: config/prefs.php.dist:746
+#: message.php:571 config/prefs.php.dist:765
+msgid "Body Text with Attachments"
+msgstr "Beskedtekst med vedhæftelse"
+
+#: config/prefs.php.dist:626
+msgid "Bold"
+msgstr "Fed"
+
+#: config/prefs.php.dist:939
 msgid "Both Header Listing and Body of Message"
 msgstr "Både beskedens felt-liste og brødtekst"
 
-#: lib/IMAP/Client.php:501
-msgid "CRAM-MD5 or DIGEST-MD5 requires the Auth_SASL package to be installed."
-msgstr "CRAM-MD5 eller DIGEST-MD5 kræver, at Auth_SASL pakker er installeret."
+#: config/prefs.php.dist:684
+msgid "Bottom"
+msgstr "Bund"
+
+#: config/prefs.php.dist:640
+msgid "Bulleted List"
+msgstr "Punkt-liste"
 
-#: compose.php:1185
+#: lib/IMAP/Client.php:407
+msgid ""
+"CRAM-MD5 or DIGEST-MD5 requires PEAR's Auth_SASL package to be installed."
+msgstr ""
+"CRAM-MD5 eller DIGEST-MD5 kræver, at Auth_SASL pakker fra PEAR er "
+"installeret."
+
+#: compose.php:1025
 msgid "C_harset"
 msgstr "Tegnsæt"
 
-#: search.php:322
+#: search.php:279 config/hooks.php.dist:487
 msgid "Calendar"
 msgstr "Kalender"
 
-#: lib/Fetchmail/imap.php:155
-msgid "Can not connect to the remote mail server."
+#: templates/smime/import_key.html:70 templates/smime/passphrase.html:24
+#: templates/saveimage/saveimage.html:20 templates/pgp/import_key.html:49
+#: templates/pgp/passphrase.html:22 templates/folders/folders_confirm.html:24
+#: templates/folders/import.html:18 templates/contacts/contacts.html:69
+msgid "Cancel"
+msgstr "Annuller"
+
+#: templates/compose/compose.html:21 templates/compose/compose.html:208
+#: templates/compose/redirect.html:84
+msgid "Cancel Message"
+msgstr "Annuller besked"
+
+#: templates/javascript_defs.php:29
+msgid "Cancelling this message will permanently discard its contents."
+msgstr "Hvis du annullerer denne besked, mister du indholdet permanent."
+
+#: lib/Fetchmail/imap.php:151
+msgid "Cannot connect to the remote mail server."
 msgstr "Kunne ikke få forbindelse til mail-serveren."
 
-#: lib/Fetchmail/imap.php:153
-msgid "Can not connect to the remote mail server: "
+#: lib/Fetchmail/imap.php:149
+msgid "Cannot connect to the remote mail server: "
 msgstr "Kan ikke forbinde til fjern mail-server: "
 
-#: lib/MIME/Viewer/partial.php:50
+#: lib/IMAP/Tree.php:2093
+msgid "Cannot directly create mailbox in this folder."
+msgstr "Der kan ikke oprettes in postkassen i denne mappe."
+
+#: lib/MIME/Viewer/partial.php:47
 #, php-format
 msgid ""
-"Can not display - found only %s of %s parts of this message in the current "
+"Cannot display - found only %s of %s parts of this message in the current "
 "mailbox."
 msgstr ""
-"Kan ikke vises - har kun funder %s af %s dele af denne besked i den aktuelle "
+"Kan ikke vises - har kun fundet %s af %s dele af denne besked i den aktuelle "
 "brevbakke."
 
-#: templates/saveimage/saveimage.html:19 templates/smime/passphrase.html:24
-#: templates/smime/import_key.html:70 templates/pgp/passphrase.html:24
-#: templates/pgp/import_key.html:49 templates/folders/folders_confirm.html:23
-#: templates/folders/import.html:17 templates/contacts/contacts.html:74
-#: templates/compose/spelling.html:60
-msgid "Cancel"
-msgstr "Annuller"
-
-#: templates/compose/compose.html:25 templates/compose/compose.html:210
-#: templates/compose/redirect.html:78
-msgid "Cancel Message"
-msgstr "Annuller besked"
+#: lib/Message.php:199
+msgid "Cannot move messages to Trash - no Trash mailbox set in preferences."
+msgstr ""
+"Beskederne kan ikke flyttes til skraldespoanden - der er ikke opsat en "
+"skraldespand."
 
-#: templates/javascript/compose.js:2 templates/javascript/src/compose.js:12
-msgid "Cancelling this message will permanently discard its contents."
-msgstr "Hvis du annullerer denne besked, mister du indholdet permanent."
+#: pgp.php:282
+msgid "Cannot retrieve public key from cache."
+msgstr "Kunne ikke hente offentlig nøgle fra cache."
 
-#: message.php:230 lib/Search.php:614 templates/login/recompose.html:23
-#: templates/contacts/contacts.html:41
+#: lib/Search.php:721 lib/UI/Message.php:27 templates/login/recompose.html:23
+#: templates/contacts/contacts.html:42
 msgid "Cc"
 msgstr "Cc"
 
-#: templates/smime/smime.html:77
+#: templates/smime/smime.html:79
 msgid ""
 "Certificate import is not available. File upload is not enabled on this "
 "server."
@@ -771,23 +859,15 @@ msgstr ""
 "Import af certifikat ikke mulig. Hentning af filer er ikke slået til på "
 "denne server."
 
-#: lib/MIME/Viewer/itip.php:703 lib/MIME/Viewer/itip.php:826
+#: lib/MIME/Viewer/itip.php:823 lib/MIME/Viewer/itip.php:955
 msgid "Chair Person"
 msgstr "Mødeleder"
 
-#: templates/compose/spelling.html:34
-msgid "Change"
-msgstr "Ændre"
-
-#: templates/compose/spelling.html:35
-msgid "Change All"
-msgstr "Ændre alle"
-
-#: acl.php:166 acl.php:167
+#: acl.php:173 acl.php:174 templates/acl/acl.html:13
 msgid "Change Folder"
 msgstr "Skift mappe"
 
-#: config/prefs.php.dist:116
+#: config/prefs.php.dist:149
 msgid ""
 "Change display options such as how many messages you see on each page and "
 "how messages are sorted."
@@ -795,11 +875,11 @@ msgstr ""
 "Her kan du ændre måden dine beskeder bliver vist på, som f.eks. hvor mange "
 "beskeder der vises på hver side, samt hvordan de sorteres."
 
-#: config/prefs.php.dist:24
+#: config/prefs.php.dist:26
 msgid "Change mail server and folder settings."
 msgstr "Her kan du ændre opsætningen til mailserver og mapper."
 
-#: config/prefs.php.dist:15
+#: config/prefs.php.dist:16
 msgid ""
 "Change the name, address, and signature that people see when they read and "
 "reply to your email."
@@ -807,81 +887,107 @@ msgstr ""
 "Her kan du ændre navn, adresse og den signatur, som andre ser, når de læser "
 "og svarer på dine e-mail."
 
-#: config/prefs.php.dist:885
+#: config/prefs.php.dist:1108
 msgid "Characters to display:"
 msgstr "Tegn til visning:"
 
-#: folders.php:296 mailbox.php:640
-msgid "Check _All/None"
+#: templates/mailbox/message_headers.html:13 templates/folders/actions.html:6
+msgid "Check All/None"
 msgstr "Hak alle/ingen af"
 
-#: templates/fetchmail/fetchmail.html:11
-msgid "Check all mail servers you want to fetch mail from:"
-msgstr "Har alle mail-serveren, som du vil hente e-mail fra, af:"
+#: lib/UI/Compose.php:152
+msgid "Check Spelling"
+msgstr "Kontroller stavning"
 
-#: templates/folders/actions.html:22
+#: folders.php:372 mailbox.php:656
+msgid "Check _All/None"
+msgstr "Hak alle/ingen af"
+
+#: templates/folders/actions.html:29
 msgid "Check for New Mail"
 msgstr "Kontroller for ny e-post"
 
-#: config/prefs.php.dist:515
+#: config/prefs.php.dist:557
 msgid "Check spelling before sending a message?"
 msgstr "Kontrollér stavning før afsendelse af besked?"
 
-#: templates/folders/actions.html:6
+#: lib/UI/Compose.php:153
+msgid "Checking ..."
+msgstr "Kontrollerer ..."
+
+#: templates/folders/actions.html:11 templates/folders/actions.html:13
 msgid "Choose Action"
 msgstr "Vælg handling"
 
-#: config/servers.php.dist:202
+#: config/servers.php.dist:224
 msgid "Choose a mail server:"
 msgstr "Vælg mail-server:"
 
-#: templates/compose/compose.html:69
+#: templates/compose/compose.html:65
 msgid "Choose a match or edit the address to the right:"
 msgstr "Vælg en pasning eller ret adressen til højre:"
 
-#: templates/prefs/sourceselect.inc:349
+#: templates/prefs/sourceselect.inc:343
 msgid "Choose the address book to use when adding addresses."
 msgstr "Vælg den adressekartotek, som der skal kunne tilføjes adresser til."
 
-#: templates/prefs/sourceselect.inc:293
+#: templates/prefs/sourceselect.inc:289
 msgid "Choose the order of address books to search when expanding addresses."
 msgstr ""
 "Vælg den rækkefølge som adressekartoteker bliver gennemsøgt i, når du slår "
 "adresser op."
 
-#: lib/MIME/Viewer/images.php:115
+#: config/prefs.php.dist:657
+msgid "Clear Inline Font Specifications"
+msgstr "Fjern indlejrede skrifttype angivelser"
+
+#: config/prefs.php.dist:656
+msgid "Clear MSOffice tags"
+msgstr "Fjern MSOffice opmærkning"
+
+#: lib/MIME/Viewer/images.php:101
 #, php-format
 msgid "Click %s to convert the image file into a format your browser can view."
 msgstr ""
 "Click %s for at omsætte billedfilen til et format, som din browser kan vise."
 
-#: lib/MIME/Viewer/images.php:104
+#: lib/MIME/Contents.php:449
+#, php-format
+msgid "Click %s to download the data."
+msgstr "Click %s for at hente data."
+
+#: lib/MIME/Viewer/images.php:90
 #, php-format
 msgid "Click %s to download the image."
 msgstr "Click %s for at hente billedet."
 
-#: lib/Filter.php:128
+#: lib/Filter.php:131
 #, php-format
 msgid "Click %s to go to %s management page."
 msgstr "Click %s for at komme til %s vedligeholdelsessiden."
 
-#: lib/MIME/Viewer/images.php:164
-#, php-format
-msgid "Click %s to view a thumbnail of this image."
-msgstr "Click %s for at se en frimærkeudgave af billedet."
-
-#: lib/MIME/Viewer/pkcs7.php:424
+#: lib/MIME/Viewer/pkcs7.php:487
 #, php-format
 msgid "Click %s to view the attachment in a separate window."
 msgstr "Click %s for at se vedhæftelsen i et separat vindue."
 
-#: lib/MIME/Viewer/related.php:78
+#: lib/MIME/Viewer/related.php:85
 #, php-format
 msgid "Click %s to view this multipart/related part in a separate window."
 msgstr ""
 "Click %s for at se denne <em>multipart/related</em> del i et separat vindue."
 
-#: templates/prefs/sourceselect.inc:321
+#: lib/MIME/Viewer/pgp.php:248 lib/MIME/Viewer/pgp.php:275
+#: lib/MIME/Viewer/pkcs7.php:220
+msgid "Click HERE to verify the message."
+msgstr "Click HERs for at kontrollere beskeden."
+
+#: config/prefs.php.dist:531
+#, php-format
+msgid "Click here to open all mailto: links in %s."
+msgstr "Klik her for at åbne alle mailto: lænker i %s."
+
+#: templates/prefs/sourceselect.inc:319
 msgid ""
 "Click on one of your selected address books and then select all fields to "
 "search."
@@ -889,64 +995,63 @@ msgstr ""
 "Klik på en af de valgte adressekartoteker og vælg de felter, der skal søges "
 "i."
 
-#: lib/MIME/Viewer/pkcs7.php:202
-#, php-format
-msgid "Click to Save S/MIME certificate of %s in your Address Book"
-msgstr "Click for at gemme S/MIME-certifikat for %s i dit adressekartotek"
-
-#: config/prefs.php.dist:1011
+#: config/prefs.php.dist:1241
 msgid "Clicking on the address will compose a new message to the sender"
 msgstr "Skriv et nyt brev til afsenderen ved at clicke på adressen"
 
-#: config/prefs.php.dist:1012
+#: config/prefs.php.dist:1242
 msgid "Clicking on the address will open the message to be read"
 msgstr "Beskeden vil bliver åbnet til læsning ved at clicke på adressen"
 
-#: templates/fetchmail/fetchmail.html:31
+#: templates/newmsg/alert.html:17 templates/fetchmail/fetchmail.html:33
 msgid "Close"
 msgstr "Luk"
 
-#: compose.php:150
+#: compose.php:34
 msgid "Close this window"
 msgstr "Luk vindue"
 
-#: lib/IMAP/Tree.php:440
+#: lib/IMAP/Tree.php:2038
 msgid "Closed Folder"
 msgstr "Lukket mappe"
 
-#: lib/IMAP/Tree.php:474
+#: folders.php:453
 msgid "Collapse"
 msgstr "Luk alle"
 
-#: folders.php:314
+#: folders.php:388
 msgid "Collapse All"
 msgstr "Luk alle"
 
-#: folders.php:314
+#: folders.php:388
 msgid "Collapse All Folders"
 msgstr "Fold alle mapper sammen"
 
-#: lib/IMAP/Tree.php:474
+#: folders.php:453
 msgid "Collapse Folder"
 msgstr "Fold mappe sammen"
 
-#: templates/pgp/pgp.html:94
+#: templates/fetchmail/fetchmailprefs.html:94
+msgid "Color Indicator:"
+msgstr "Farvemærke"
+
+#: config/prefs.php.dist:1279
+msgid "Combine all namespaces"
+msgstr ""
+
+#: templates/pgp/pgp.html:97
 msgid "Comment:"
 msgstr "Kommentar:"
 
-#: lib/MIME/Viewer/itip.php:892
+#: lib/MIME/Viewer/itip.php:1025
 msgid "Completed"
 msgstr "Afsluttet"
 
-#: compose.php:149
-msgid "Compose another message"
-msgstr "Skriv en anden besked"
-
-#: config/prefs.php.dist:466
+#: config/prefs.php.dist:581
 msgid "Compose messages in a separate window?"
 msgstr "Skriv beskeder i et seperat vindue?"
 
-#: config/prefs.php.dist:476
+#: config/prefs.php.dist:591
 msgid ""
 "Compose messages with an HTML GUI by default (if browser supports the "
 "feature)?"
@@ -954,37 +1059,33 @@ msgstr ""
 "Skrive beskeder med en HTML-snitflade som standard (browser skal understøtte "
 "muligheden)?"
 
-#: config/prefs.php.dist:70
+#: config/prefs.php.dist:95
 msgid "Configure how messages are displayed."
 msgstr "Indstil hvordan beskeder skal vises."
 
-#: config/prefs.php.dist:101
+#: config/prefs.php.dist:131
 msgid "Configure mail preview options."
 msgstr "Konfigurér indstillinger af forhåndsvisning."
 
-#: lib/IMAP/Client.php:370
-msgid "Connection dropped by IMAP server."
-msgstr "Forbindelsen blev afbrudt af IMAP-server."
+#: config/hooks.php.dist:556
+msgid "Connection to server failed."
+msgstr "Forbindelse til server fejlede."
 
-#: lib/Fetchmail/imap.php:188
-msgid "Connection to server failed"
-msgstr "Forbindelse til server fejlede"
+#: config/hooks.php.dist:511
+msgid "Contacts"
+msgstr "Kontakter"
 
-#: config/prefs.php.dist:147
+#: config/prefs.php.dist:177
 #, php-format
 msgid "Control PGP support for %s."
 msgstr "Kontrollér PGP-understøttelse for %s."
 
-#: config/prefs.php.dist:156
+#: config/prefs.php.dist:186
 #, php-format
 msgid "Control S/MIME support for %s."
 msgstr "Kontrollér S/MIME understøttelse for %s."
 
-#: config/prefs.php.dist:125
-msgid "Control options relating to messages searching."
-msgstr "Kontrollér indstillinger vedrørende søgning af beskeder."
-
-#: config/prefs.php.dist:93
+#: config/prefs.php.dist:123
 msgid ""
 "Control when new mail will be checked for, and whether or not to notify you "
 "when it arrives."
@@ -992,92 +1093,126 @@ msgstr ""
 "Indstil hvornår der checkes for ny e-mail, samt om du skal informeres, når "
 "disse er ankommet."
 
-#: config/prefs.php.dist:736
+#: config/prefs.php.dist:929
 msgid "Convert textual emoticons into graphical ones?"
 msgstr "Omsæt tekst-<em>smileys</em> til grafiske?"
 
-#: mailbox.php:420 mailbox.php:1007 message.php:508 message.php:700
+#: mailbox.php:486 mailbox.php:895 message.php:520 message.php:707
 msgid "Copy"
 msgstr "Kopier"
 
-#: mailbox.php:420 mailbox.php:1007 message.php:508 message.php:700
+#: config/prefs.php.dist:652
+msgid "Copy selection"
+msgstr "Kopieringsvalg"
+
+#: mailbox.php:486 mailbox.php:895 message.php:520 message.php:707
 msgid "Copy to folder"
 msgstr "Kopiér til mappe"
 
-#: templates/compose/spelling.html:28
-msgid "Correct"
-msgstr "Korriger"
-
-#: templates/compose/spelling.html:82
-msgid "Corrected Text"
-msgstr "Korrigeret tekst"
+#: lib/Compose.php:2094
+#, php-format
+msgid "Could not attach %s to the message."
+msgstr "Kunne ikke vedhæfte \"%s\"til beskeden-"
 
-#: lib/IMAP/Client.php:382
+#: lib/IMAP/Client.php:189
 #, php-format
 msgid "Could not complete request. Reason Given: %s"
 msgstr "Kunne ikke fuldføre anmodning. Årsag: %s"
 
-#: attachment.php:50
+#: attachment.php:51
 #, php-format
 msgid "Could not create the VFS backend: %s"
 msgstr "Kunne ikke oprette <em>VFS backend:</em> %s"
 
-#: lib/Message.php:730
+#: lib/Message.php:790
 #, php-format
 msgid "Could not delete messages from %s. The server said: %s"
 msgstr "Kunne ikke slette beskeder fra \"%s\". Serveren meldte: %s"
 
-#: lib/Session.php:334
+#: lib/Session.php:333
 msgid "Could not execute maintenance operations."
 msgstr "Kunne ikke udføre vedligeholdelsesopgaver."
 
-#: lib/MIME/Viewer/tnef.php:54
+#: lib/MIME/Viewer/tnef.php:53
 msgid "Could not extract the requested file from the MS-TNEF attachment."
 msgstr "Kunne ikke uddrage den anmodede fil fra MS-TNEF-vedhæftelsen."
 
-#: lib/MIME/Viewer/zip.php:58
+#: lib/MIME/Viewer/zip.php:61
 msgid "Could not extract the requested file from the Zip archive."
 msgstr "Kunne ikke uddrage den anmodede file fra Zip-arkivet."
 
-#: lib/IMAP/Client.php:446
-#, php-format
-msgid "Could not open secure connection to the IMAP server. %s : %s."
-msgstr "Kunne ikke åbne sikker forbindelse til IMAP serveren. %s : %s."
+#: lib/Spam.php:237
+msgid ""
+"Could not move message to spam mailbox - no spam mailbox defined in "
+"preferences."
+msgstr ""
+"Besked kan ikke flyttes til skidtpost - der er ikke opsat nogen skidtpost "
+"folder."
 
-#: lib/Session.php:281
+#: lib/IMAP/Client.php:318
+msgid "Could not open secure connection to the IMAP server."
+msgstr "Kunne ikke åbne sikker forbindelse til IMAP serveren."
+
+#: lib/Session.php:284
 msgid "Could not retrieve namespace information from IMAP server."
 msgstr "Kunne ikke indhente <em>namespace</em>-information fra IMAP-serveren."
 
-#: compose.php:168
+#: compose.php:52
 msgid "Could not retrieve the message from the mail server."
 msgstr "Kunne ikke hente beskeden fra post-serveren."
 
-#: templates/javascript/acl.js:4 templates/javascript/src/acl.js:47
-#: templates/folders/actions.html:9 templates/acl/acl.html:89
+#: lib/Compose.php:1099
+#, php-format
+msgid "Could not save recipients: %s"
+msgstr "Kunne ikke gemme motagerbe: %s"
+
+#: lib/Template.php:231
+#, php-format
+msgid "Could not save the compiled template file '%s'."
+msgstr "Kunne ikke gemme timeplate file %s."
+
+#: templates/folders/actions.html:16
+#: templates/fetchmail/fetchmailprefs.html:121
 msgid "Create"
 msgstr "Opret"
 
+#: lib/IMAP/ACL/rfc2086.php:55
+msgid "Create Folder"
+msgstr "Opret mappe"
+
+#: lib/IMAP/ACL/rfc4314.php:55
+msgid "Create Folders"
+msgstr "Opret mapper"
+
 #: templates/pgp/pgp.html:129
 msgid "Create Keys"
 msgstr "Opret nøgler"
 
-#: templates/prefs/spamselect.inc:12 templates/prefs/spamselect.inc:24
+#: templates/fetchmail/fetchmailprefs.html:28
+msgid "Create a New Account"
+msgstr "Opret Ny Konto"
+
+#: templates/prefs/spamselect.inc:11 templates/prefs/spamselect.inc:20
 msgid "Create a new Spam folder"
 msgstr "Opret en ny spam-mappe"
 
-#: templates/prefs/folderselect.inc:12 templates/prefs/folderselect.inc:24
+#: templates/prefs/folderselect.inc:11 templates/prefs/folderselect.inc:22
 msgid "Create a new drafts folder"
 msgstr "Opret en ny mappe til kladder"
 
-#: templates/prefs/sentmailselect.inc:26 templates/prefs/sentmailselect.inc:42
+#: templates/prefs/sentmailselect.inc:25 templates/prefs/sentmailselect.inc:40
 msgid "Create a new sent mail folder"
 msgstr "Opret en ny mappe til afsendte beskeder"
 
-#: templates/prefs/trashselect.inc:12 templates/prefs/trashselect.inc:24
+#: templates/prefs/trashselect.inc:11 templates/prefs/trashselect.inc:25
 msgid "Create a new trash folder"
 msgstr "Opret en ny skraldespand til slettede beskeder"
 
-#: config/prefs.php.dist:132
+#: templates/fetchmail/fetchmail.html:23
+msgid "Create an account"
+msgstr "Opret en ny konto"
+
+#: config/prefs.php.dist:162
 msgid ""
 "Create filtering rules to organize your incoming mail, sort it into folders, "
 "and delete spam."
@@ -1085,553 +1220,638 @@ msgstr ""
 "Opret filterregler, der sorterer nye e-mails, flytter dem i mapper og "
 "sletter spam."
 
-#: templates/stationery/prefs.inc:14
+#: templates/stationery/stationery.html:14
 msgid "Create new stationery"
 msgstr "Opret en nyt brevpapir"
 
-#: config/prefs.php.dist:501
-msgid "Create stationery and form responses."
-msgstr "Opret brevpapir og formular-svar."
+#: templates/compose/compose.html:317
+msgid "Current Attachments"
+msgstr "Vedhæftelser"
+
+#: acl.php:176
+#, php-format
+msgid "Current access to %s"
+msgstr "Indeværende konto %s"
 
-#: config/prefs.php.dist:1051
+#: config/prefs.php.dist:1292
 msgid "Current expanded status in the folders view"
-msgstr "Nuværende udviddelsestilstand i mappe-oversigt"
+msgstr "Nuværende udvidelsestilstand i mappe-oversigt"
 
-#: config/prefs.php.dist:109
+#: config/prefs.php.dist:632
+msgid "Current style"
+msgstr "Nuværende konto"
+
+#: config/prefs.php.dist:140
 msgid "Customize accounts for fetching mail from other accounts."
 msgstr "Tilret konti til hentning af e-mail fra andre konti."
 
-#: config/prefs.php.dist:53
+#: config/prefs.php.dist:88
+msgid "Customize how to deal with message drafts."
+msgstr "Tilpas hvordan du sender e-mail."
+
+#: config/prefs.php.dist:80
+msgid "Customize how you reply to or forward mail."
+msgstr "Tilpas hvordan du besvarer eller videresender e-mail."
+
+#: config/prefs.php.dist:64
 msgid "Customize how you send mail."
 msgstr "Tilpas hvordan du sender e-mail."
 
-#: config/prefs.php.dist:40
+#: config/prefs.php.dist:44
 #, php-format
 msgid "Customize tasks to run upon logon to %s."
 msgstr "Tilpas opgaver, der bliver udført, når du logger ind i %s."
 
-#: mailbox.php:565
+#: config/prefs.php.dist:651
+msgid "Cut selection"
+msgstr "Slet udvalgte"
+
+#: mailbox.php:582
 msgid "Dat_e"
 msgstr "Dato"
 
-#: message.php:227 thread.php:150
+#: lib/UI/Message.php:24
 msgid "Date"
 msgstr "Dato"
 
-#: lib/MIME/Viewer/itip.php:880
+#: lib/Search.php:751
+msgid "Date <"
+msgstr "Dato <"
+
+#: lib/Search.php:746
+msgid "Date ="
+msgstr "Dato ="
+
+#: lib/Search.php:756
+msgid "Date >="
+msgstr "Dato >="
+
+#: templates/thread/thread.html:26
+msgid "Date:"
+msgstr "Dato:"
+
+#: templates/search/search.html:99
+msgid "Day"
+msgstr "Dag"
+
+#: lib/MIME/Viewer/itip.php:1013
 msgid "Declined"
 msgstr "Afvist"
 
-#: lib/MIME/Viewer/itip.php:267
+#: lib/MIME/Viewer/itip.php:290
 msgid "Declined: "
 msgstr "Afvist: "
 
-#: config/prefs.php.dist:600
+#: config/prefs.php.dist:641
+msgid "Decrease Indent"
+msgstr "Mindsk indrykning"
+
+#: config/prefs.php.dist:695
 msgid "Default"
 msgstr "Standard"
 
-#: templates/prefs/defaultsearchselect.inc:21
-msgid "Default Search Field"
-msgstr "Standard søgefelt"
+#: config/prefs.php.dist:962
+msgid "Default (US-ASCII)"
+msgstr "Standard (US-ASCII)"
 
-#: config/prefs.php.dist:984
+#: config/prefs.php.dist:766
+msgid "Default forwarding method:"
+msgstr "Standard videresendelsesmetode:"
+
+#: config/prefs.php.dist:1207
 msgid "Default sorting criteria:"
 msgstr "Standard sorteringskriterie:"
 
-#: config/prefs.php.dist:994
+#: config/prefs.php.dist:1217
 msgid "Default sorting direction:"
 msgstr "Standard sorteringsretning:"
 
-#: lib/MIME/Viewer/itip.php:888
+#: lib/MIME/Viewer/itip.php:1021
 msgid "Delegated"
 msgstr "Delegeret"
 
-#: mailbox.php:463 mailbox.php:466 message.php:541 lib/IMAP/Tree.php:427
-#: templates/smime/smime.html:25 templates/pgp/pgp.html:34
-#: templates/folders/actions.html:12 templates/contacts/contacts.html:64
+#: folders.php:418 mailbox.php:508 mailbox.php:510 message.php:554
+#: lib/IMAP/ACL/rfc4314.php:57 templates/smime/smime.html:35
+#: templates/pgp/pgp.html:43 templates/folders/actions.html:19
+#: templates/fetchmail/fetchmailprefs.html:122
+#: templates/contacts/contacts.html:59
 msgid "Delete"
 msgstr "Slet"
 
-#: pgp.php:370 smime.php:296
+#: pgp.php:419 smime.php:320
 #, php-format
 msgid "Delete %s Public Key"
 msgstr "Slet %s offentlige nøgle"
 
-#: templates/smime/smime.html:73 templates/pgp/pgp.html:83
+#: templates/smime/smime.html:75 templates/pgp/pgp.html:86
 msgid "Delete Current Keys"
 msgstr "Slet aktuel nøgle"
 
-#: templates/folders/folders_confirm.html:22
+#: lib/IMAP/ACL/rfc4314.php:56
+msgid "Delete Folders"
+msgstr "Slet mapper"
+
+#: templates/folders/folders_confirm.html:23
 msgid "Delete Selected Folders"
 msgstr "Slet valgte mapper"
 
-#: templates/stationery/prefs.inc:42
+#: templates/stationery/stationery.html:44
 msgid "Delete Stationery"
 msgstr "Slet brevpapir"
 
-#: lib/IMAP/Tree.php:427
+#: thread.php:170
+msgid "Delete Thread"
+msgstr "Slet tråd"
+
+#: folders.php:418
 msgid "Delete Virtual Folder"
 msgstr "Slet virtuel mappe"
 
-#: mailbox.php:361
+#: mailbox.php:428
 #, php-format
 msgid "Delete Virtual Folder Definition for %s"
 msgstr "Slet virtuel mappe definition for %s"
 
-#: lib/MIME/Viewer/itip.php:626
+#: templates/fetchmail/fetchmailprefs.html:86
+msgid "Delete fetched messages from remote server?"
+msgstr "Slet hentede beskeder fra post-serveren?"
+
+#: lib/MIME/Viewer/itip.php:746
 msgid "Delete from my calendar"
 msgstr "Slet fra min kalender"
 
-#: config/prefs.php.dist:400
+#: config/prefs.php.dist:430
 msgid "Delete old linked attachments at beginning of month?"
 msgstr "Slet gamle refererede vedhæftelser i starten af måneden?"
 
-#: config/prefs.php.dist:354
+#: config/prefs.php.dist:384
 msgid "Delete old sent-mail folders at beginning of month?"
 msgstr "Slet gamle mapper for afsendte beskeder i starten af måneden?"
 
-#: config/prefs.php.dist:668
+#: config/prefs.php.dist:856
 msgid "Delete spam messages"
 msgstr "Slet spam-beskeder"
 
-#: templates/compose/compose.html:339
+#: lib/IMAP/ACL/rfc2086.php:56
+msgid "Delete/purge"
+msgstr "Slet"
+
+#: templates/compose/compose.html:345
 msgid "Delete?"
 msgstr "Slet?"
 
-#: mailbox.php:850 mailbox.php:982 message.php:472
-#: templates/mailbox/legend.html:6 templates/mailbox/navbar.html:17
-#: templates/mailbox/navbar.html:33
+#: mailbox.php:779 message.php:480 templates/mailbox/navbar.html:20
+#: templates/mailbox/navbar.html:37
 msgid "Deleted"
 msgstr "Slettet"
 
-#: search.php:349
+#: lib/Search.php:817
 msgid "Deleted messages"
 msgstr "Slettede beskeder"
 
-#: compose.php:315
+#: compose.php:240
 #, php-format
 msgid "Deleted the attachment \"%s\"."
 msgstr "Vedhæftelsen \"%s\" slettet."
 
-#: config/prefs.php.dist:83
+#: config/prefs.php.dist:109
 msgid "Deleting and Moving Messages"
 msgstr "Sletter og flytter beskeder"
 
-#: lib/MIME/Viewer/itip.php:594
+#: lib/MIME/Viewer/itip.php:718
 msgid "Deny request"
 msgstr "Afvis anmodning"
 
-#: lib/MIME/Viewer/itip.php:549
+#: lib/MIME/Viewer/itip.php:638
 msgid "Deny request for free/busy information"
 msgstr "Afvis anmodning om ledig/optaget-information"
 
-#: config/prefs.php.dist:993
+#: config/prefs.php.dist:1216
 msgid "Descending"
 msgstr "Faldende"
 
-#: lib/MIME/Viewer/itip.php:673 lib/MIME/Viewer/itip.php:801
+#: lib/MIME/Viewer/itip.php:799 lib/MIME/Viewer/itip.php:930
 msgid "Description"
 msgstr "Beskrivelse"
 
-#: templates/compose/compose.html:333
+#: templates/compose/compose.html:341
 msgid "Description:"
 msgstr "Beskrivelse:"
 
-#: templates/smime/smime.html:25 templates/smime/smime.html:61
-#: templates/pgp/pgp.html:34 templates/pgp/pgp.html:69
-#: templates/pgp/pgp.html:74
+#: templates/smime/smime.html:35 templates/smime/smime.html:67
+#: templates/pgp/pgp.html:43 templates/pgp/pgp.html:75
+#: templates/pgp/pgp.html:80
 msgid "Details"
 msgstr "Detaljer"
 
-#: compose.php:327
+#: lib/Compose.php:2936
+#, php-format
+msgid "Did not attach \"%s\" as it was only partially uploaded."
+msgstr "Vedhæftede ikke \"%s\", da filen kun var delvist overført."
+
+#: lib/Compose.php:2945
 #, php-format
 msgid "Did not attach \"%s\" as the file was empty."
 msgstr "Vedhæftede ikke \"%s\", da filen er tom."
 
-#: config/prefs.php.dist:728
+#: lib/Compose.php:2932
+#, php-format
+msgid ""
+"Did not attach \"%s\" as the maximum allowed upload size has been exceeded."
+msgstr ""
+"Vedhæftede ikke \"%s\", da den maksimale overførselsstørrelse er overskredet."
+
+#: lib/Compose.php:2940
+#, php-format
+msgid ""
+"Did not attach \"%s\" as the server configuration did not allow the file to "
+"be uploaded."
+msgstr ""
+"Vedhæftede ikke \"%s\" da server-konfigurationen ikke tillod overførsel af "
+"den."
+
+#: config/prefs.php.dist:921
 msgid "Dim signatures?"
 msgstr "Slør signaturer?"
 
-#: templates/contacts/contacts.html:56
-msgid "Display"
-msgstr "Vis"
+#: config/prefs.php.dist:661
+msgid "Direction left to right"
+msgstr "Venstre mod højre"
 
-#: config/prefs.php.dist:531
+#: config/prefs.php.dist:662
+msgid "Direction right to left"
+msgstr "Højre mod venstre"
+
+#: config/prefs.php.dist:283
+msgid "Display Virtual Inbox?"
+msgstr "Vis virtuel Indbakke"
+
+#: config/prefs.php.dist:565
 msgid "Display confirmation after sending a message?"
 msgstr "Vis bekræftelse efter afsendelse af en besked?"
 
-#: config/prefs.php.dist:745
+#: config/prefs.php.dist:938
 msgid "Display in Body of Message"
 msgstr "Vis i brødtekst af besked"
 
-#: config/prefs.php.dist:854
+#: config/prefs.php.dist:1072
 msgid "Display pop-up notification of new mail?"
 msgstr "Vis et popup vindue ved nye e-mail."
 
-#: config/prefs.php.dist:820
+#: config/prefs.php.dist:1037
 msgid "Display the \"Empty Spam\" link in the menubar?"
 msgstr "Vis \"Tøm spam\" henvisningen i menulinien?"
 
-#: config/prefs.php.dist:812
+#: config/prefs.php.dist:1029
 msgid "Display the \"Empty Trash\" link in the menubar?"
 msgstr "Vis \"Tøm skraldespand\" henvisningen i menulinien?"
 
-#: templates/compose/compose.html:324
+#: templates/compose/compose.html:332
 msgid "Disposition:"
 msgstr "Anbringelse:"
 
-#: templates/search/search.html:83
+#: templates/search/search.html:87
 msgid "Do NOT match"
 msgstr "Pas IKKE til"
 
-#: templates/folders/actions.html:23
+#: templates/folders/actions.html:30
 msgid "Do Not Check for New Mail"
 msgstr "Undlad at checke for ny e-post"
 
-#: config/prefs.php.dist:1013
+#: config/prefs.php.dist:1243
 msgid "Do not generate a link in the From: column"
 msgstr "Generér ikke henvisning i Fra: kolonnen"
 
-#: lib/IMP.php:986
-msgid "Do you want to open that folder?"
-msgstr "Vil du åbne denne mappe?"
+#: templates/javascript_defs.php:30
+msgid "Doing so will discard this message permanently."
+msgstr "Dette vil slette beskeden permanent."
 
-#: login.php:355
+#: login.php:430
 msgid "Don't have an account? Sign up."
 msgstr "Har du ikke nogen konto? Meld dig til."
 
-#: templates/compose/spelling.html:66
-msgid "Done"
-msgstr "Færdig"
-
-#: templates/folders/actions.html:27
+#: templates/folders/actions.html:34
 msgid "Download"
 msgstr "Hent"
 
-#: lib/MIME/Contents.php:229
+#: lib/MIME/Contents.php:250
 #, php-format
 msgid "Download %s in .zip Format"
 msgstr "Hent %s i .zip-format"
 
-#: message.php:668
+#: message.php:680
 msgid "Download All Attachments (in .zip file)"
 msgstr "Hent alle vedhæftelser (i .zip-fil)"
 
-#: templates/folders/actions.html:28
+#: templates/folders/actions.html:35
 msgid "Download [.zip format]"
 msgstr "Hent [.zip-format]"
 
-#: lib/MIME/Contents.php:229
+#: lib/MIME/Contents.php:250
 msgid "Download in .zip Format"
 msgstr "Hent i .zip-format"
 
-#: mailbox.php:832 mailbox.php:983 message.php:470
-#: templates/message/navbar_navigate.html:11 templates/mailbox/legend.html:7
-#: templates/mailbox/navbar.html:19 templates/mailbox/navbar.html:36
+#: mailbox.php:769 message.php:478 templates/message/navbar_navigate.html:14
+#: templates/mailbox/navbar.html:22 templates/mailbox/navbar.html:40
 msgid "Draft"
 msgstr "Kladde"
 
-#: lib/IMAP/Tree.php:392
+#: lib/IMAP/Tree.php:1993
 msgid "Draft folder"
 msgstr "Kladder"
 
-#: templates/prefs/folderselect.inc:23
+#: config/prefs.php.dist:301
+msgid "Drafts"
+msgstr "Kladder"
+
+#: templates/prefs/folderselect.inc:19
 msgid "Drafts folder:"
 msgstr "Mappe til kladder:"
 
-#: templates/pgp/pgp.html:99
+#: login.php:266
+msgid "Dynamic"
+msgstr "Dynamisk Post"
+
+#: templates/pgp/pgp.html:102
 msgid "E-mail Address:"
 msgstr "E-post-adresse:"
 
-#: mailbox.php:904
+#: mailbox.php:834
 msgid "END"
 msgstr "SLUT"
 
-#: lib/MIME/Viewer/status.php:74
+#: lib/MIME/Viewer/status.php:73
 msgid "ERROR: Your message could not be delivered."
 msgstr "FEJL: Din besked kunne ikke afleveres."
 
-#: templates/stationery/prefs.inc:19 lib/IMAP/Tree.php:428
+#: folders.php:419 templates/stationery/stationery.html:19
 msgid "Edit"
 msgstr "Rediger"
 
-#: mailbox.php:364 templates/search/search.html:20
+#: mailbox.php:431
 msgid "Edit Search Query"
 msgstr "Ændre søgetekst"
 
-#: lib/IMAP/Tree.php:428 templates/search/search.html:18
+#: folders.php:419 templates/search/search.html:17
 msgid "Edit Virtual Folder"
 msgstr "Ændre virtuel mappe"
 
-#: mailbox.php:360
+#: mailbox.php:427
 #, php-format
 msgid "Edit Virtual Folder Definition for %s"
 msgstr "Ændre virtuel mappe definitionen for %s"
 
-#: filterprefs.php:78
+#: filterprefs.php:91
 msgid "Edit your Blacklist"
 msgstr "Redigér din negativliste"
 
-#: filterprefs.php:77
+#: filterprefs.php:90
 msgid "Edit your Filter Rules"
 msgstr "Redigér dine filterregler"
 
-#: filterprefs.php:79
+#: filterprefs.php:92
 msgid "Edit your Whitelist"
 msgstr "Redigér din positivliste"
 
-#: config/prefs.php.dist:922
+#: config/prefs.php.dist:1145
 msgid "Edit your preferences for accessing other mail accounts."
-msgstr "Ændre dine præferencer vedrørende tilgang til andre e-mail-konti."
+msgstr "Ændre dine indstillinger vedrørende tilgang til andre e-mail-konti."
 
-#: templates/contacts/contacts.html:59
-msgid "Email Address"
-msgstr "e-mail-adresse"
-
-#: lib/Message.php:746
+#: lib/Message.php:807
 #, php-format
 msgid "Emptied all messages from %s."
 msgstr "Alle beskeder fjernet fra %s"
 
-#: lib/Message.php:723
+#: lib/Message.php:783
 msgid "Emptied all messages from Virtual Trash Folder."
 msgstr "Har slettet alle beskeder fra Virtuel Skraldespand."
 
-#: templates/folders/actions.html:13
+#: templates/folders/actions.html:20
 msgid "Empty"
 msgstr "Tøm"
 
-#: templates/folders/folders_confirm.html:22
+#: templates/folders/folders_confirm.html:23
 msgid "Empty Selected Folders"
 msgstr "Tøm valgte mapper"
 
-#: mailbox.php:464
-msgid "Empty Trash folder"
-msgstr "Tøm skraldespand"
-
-#: lib/IMP.php:812
+#: lib/IMP.php:859
 msgid "Empty _Spam"
 msgstr "Tøm spam"
 
-#: lib/IMP.php:802
+#: lib/IMP.php:851
 msgid "Empty _Trash"
 msgstr "Tøm skraldespand"
 
-#: pgp.php:422 templates/pgp/pgp.html:2
+#: mailbox.php:424
+msgid "Empty folder"
+msgstr "Tom mappe"
+
+#: pgp.php:472 templates/pgp/pgp.html:2
 msgid "Enable PGP functionality?"
 msgstr "Aktivér PGP-funktionalitet?"
 
-#: smime.php:332 templates/smime/smime.html:2
+#: smime.php:358 templates/smime/smime.html:2
 msgid "Enable S/MIME functionality?"
 msgstr "Aktivér S/MIME-funktionalitet?"
 
-#: config/prefs.php.dist:873
+#: config/prefs.php.dist:1096
 msgid "Enable message previews?"
 msgstr "Aktivér forhåndsvisning?"
 
-#: compose.php:1283
+#: compose.php:1149
 msgid "Encr_yption Options"
-msgstr "Krypteringsindstillinger"
+msgstr "Kr_ypteringsindstillinger"
 
-#: mailbox.php:994 templates/mailbox/legend.html:16
-msgid "Encrypted"
-msgstr "Krypteret"
-
-#: lib/MIME/Viewer/itip.php:523 lib/MIME/Viewer/itip.php:525
-#: lib/MIME/Viewer/itip.php:658 lib/MIME/Viewer/itip.php:660
-msgid "End"
-msgstr "Slut"
-
-#: lib/Compose.php:1436
+#: lib/Compose.php:1813
 msgid "End forwarded message"
-msgstr "Slutning af videresendt besked"
+msgstr "Slut på videresendt besked"
 
-#: lib/Compose.php:1365
+#: lib/Compose.php:1705
 msgid "End message"
 msgstr "Afslut besked"
 
-#: lib/Compose.php:1363
+#: lib/Compose.php:1703
 #, php-format
 msgid "End message from %s"
 msgstr "Afslut besked fra %s"
 
-#: pgp.php:396 smime.php:320
+#: lib/MIME/Viewer/itip.php:608 lib/MIME/Viewer/itip.php:610
+#: lib/MIME/Viewer/itip.php:784 lib/MIME/Viewer/itip.php:786
+msgid "End:"
+msgstr "Slut:"
+
+#: pgp.php:447 smime.php:346
 msgid "Enter Passphrase"
 msgstr "Indtast løsen"
 
-#: templates/prefs/spamselect.inc:9
+#: templates/prefs/spamselect.inc:8
 msgid "Enter the name for your new Spam folder"
 msgstr "Indtast navnet til den nye mappe, du vil bruge som spam-mappe"
 
-#: templates/prefs/folderselect.inc:9
+#: templates/prefs/folderselect.inc:8
 msgid "Enter the name for your new drafts folder"
 msgstr "Indtast navnet på den nye mappe til kladder"
 
-#: templates/prefs/sentmailselect.inc:23
+#: templates/prefs/sentmailselect.inc:22
 msgid "Enter the name for your new sent mail folder"
 msgstr "Indtast navnet på den nye mappe til afsendt e-mail"
 
-#: templates/prefs/trashselect.inc:9
+#: templates/prefs/trashselect.inc:8
 msgid "Enter the name for your new trash folder"
 msgstr "Indtast navnet på den nye skraldespand"
 
-#: lib/Search.php:630
+#: message.php:569 lib/Search.php:741 config/prefs.php.dist:763
 msgid "Entire Message"
 msgstr "Hele beskeden"
 
-#: message.php:157 thread.php:70 lib/Compose.php:706 lib/Compose.php:961
+#: message.php:175 thread.php:71 lib/Compose.php:1139
 #, php-format
 msgid "Entry \"%s\" was successfully added to the address book"
 msgstr "\"%s\" blev tilføjet til adressekartoteket"
 
-#: lib/MIME/Viewer/pgp.php:395 lib/MIME/Viewer/pkcs7.php:381
-#: lib/MIME/Viewer/status.php:72 lib/MIME/Viewer/status.php:165
+#: lib/MIME/Viewer/pgp.php:453 lib/MIME/Viewer/pkcs7.php:444
+#: lib/MIME/Viewer/status.php:71 lib/MIME/Viewer/status.php:162
 msgid "Error"
 msgstr "Fejl"
 
-#: lib/IMAP/Client.php:431 lib/IMAP/Client.php:454
+#: lib/IMAP/Client.php:303 lib/IMAP/Client.php:323
 #, php-format
-msgid "Error connecting to IMAP server. %s : %s."
-msgstr "Kunne ikke forbinde til IMAP server. %s : %s"
+msgid "Error connecting to IMAP server: [%s] %s."
+msgstr "Kunne ikke forbinde til IMAP server: [%s] %s."
 
-#: lib/MIME/Contents.php:134
+#: lib/MIME/Contents.php:150
 msgid "Error displaying message."
 msgstr "Fejl ved visning af besked."
 
-#: lib/MIME/Viewer/itip.php:313 lib/MIME/Viewer/itip.php:411
+#: lib/MIME/Viewer/itip.php:340 lib/MIME/Viewer/itip.php:446
 #, php-format
 msgid "Error sending reply: %s."
 msgstr "Fejl ved svarforsendelse: %s."
 
-#: templates/smime/smime.html:19 templates/pgp/pgp.html:28
+#: templates/smime/smime.html:29 templates/pgp/pgp.html:37
 msgid "Error:"
 msgstr "Fejl:"
 
-#: lib/MIME/Viewer/itip.php:105
+#: lib/MIME/Viewer/itip.php:103
 msgid "Event successfully deleted."
 msgstr "Hændelsen slettet."
 
-#: config/prefs.php.dist:844
+#: config/prefs.php.dist:1061
 msgid "Every 15 minutes"
 msgstr "Hver kvarter"
 
-#: config/prefs.php.dist:841
+#: config/prefs.php.dist:1058
 msgid "Every 30 seconds"
 msgstr "Hver halve minut"
 
-#: config/prefs.php.dist:582 config/prefs.php.dist:843
+#: config/prefs.php.dist:824 config/prefs.php.dist:1060
 msgid "Every 5 minutes"
 msgstr "Hver 5. minut"
 
-#: config/prefs.php.dist:845
+#: config/prefs.php.dist:1062
 msgid "Every half hour"
 msgstr "Hver halve time"
 
-#: config/prefs.php.dist:842
+#: config/prefs.php.dist:1059
 msgid "Every minute"
 msgstr "Hver minut"
 
-#: lib/IMAP/Tree.php:482
+#: folders.php:464
 msgid "Expand"
 msgstr "Udvid"
 
-#: folders.php:313
+#: folders.php:387
 msgid "Expand All"
 msgstr "Åben alle"
 
-#: folders.php:313
+#: folders.php:387
 msgid "Expand All Folders"
 msgstr "Fold alle mapper ud"
 
-#: lib/IMAP/Tree.php:482
+#: folders.php:464
 msgid "Expand Folder"
 msgstr "Fold mappe up"
 
-#: compose.php:865 compose.php:1228
+#: compose.php:827 compose.php:1079
 msgid "Expand Names"
 msgstr "Lav et opslag på navnene"
 
-#: config/prefs.php.dist:1135
-msgid "Expand names in the compose window automatically in the background?"
-msgstr "Ekspandér automatisk navne i skrivningsvinduet bag tæppet?"
-
-#: config/prefs.php.dist:1041
+#: config/prefs.php.dist:1271
 msgid "Expand the entire folder tree by default in the folders view?"
 msgstr "Åben alle mapper i oversigten som standard."
 
-#: config/prefs.php.dist:1052
+#: config/prefs.php.dist:1293
 msgid "Expand the entire folder tree by default in the sidebar?"
 msgstr "Åben som standard hele mappe-træet i sidepanelet?"
 
-#: templates/javascript/compose.js:24 templates/javascript/src/compose.js:184
-#: templates/compose/compose.html:84 templates/compose/redirect.html:67
-msgid "Expanding"
-msgstr "Udvidder"
+#: config/prefs.php.dist:601
+msgid "FCKeditor"
+msgstr "FCKeditor"
 
-#: lib/IMP.php:823 lib/IMP.php:825
+#: lib/IMP.php:870 lib/IMP.php:872
 msgid "F_etch Mail"
-msgstr "Hent e-mail"
+msgstr "_Hent e-mail"
 
-#: config/prefs.php.dist:108 templates/fetchmail/fetchmail.html:29
+#: fetchmail.php:50 config/prefs.php.dist:139
+#: templates/fetchmail/fetchmail.html:6 templates/fetchmail/fetchmail.html:30
 msgid "Fetch Mail"
 msgstr "Hent e-mail"
 
-#: config/prefs.php.dist:930
+#: config/prefs.php.dist:1153
 msgid "Fetch Mail in a separate window?"
-msgstr "Hent besked i et seperat vindue?"
+msgstr "Hent beskeder i et separat vindue?"
+
+#: templates/fetchmail/fetchmailprefs.html:89
+msgid "Fetch messages upon logging on?"
+msgstr "Hent beskeder, når du logger ind?"
 
-#: lib/Fetchmail.php:291
+#: lib/Fetchmail.php:285
 #, php-format
 msgid "Fetched %d messages from %s"
-msgstr "%d beskeder hentet fra %s"
+msgstr "Hentede %d beskeder fra %s"
 
-#: lib/Fetchmail.php:289
+#: lib/Fetchmail.php:283
 #, php-format
 msgid "Fetched 1 message from %s"
 msgstr "1 besked hentet fra %s"
 
-#: lib/Fetchmail.php:287 lib/Fetchmail.php:289 lib/Fetchmail.php:291
+#: lib/Fetchmail.php:281 lib/Fetchmail.php:283 lib/Fetchmail.php:285
 msgid "Fetchmail: "
 msgstr "Fetchmail: "
 
-#: lib/Fetchmail.php:293
+#: lib/Fetchmail.php:287
 msgid "Fetchmail: no new messages."
 msgstr "Fetchmail: ingen nye beskeder."
 
-#: lib/IMP.php:829
+#: lib/IMP.php:876
 msgid "Fi_lters"
 msgstr "Filtre"
 
-#: templates/javascript/compose.js:28 templates/javascript/src/compose.js:234
-#: templates/compose/compose.html:267
+#: templates/prefs/sourceselect.inc:329
+msgid "Fields to search"
+msgstr "Felter for søgning"
+
+#: templates/javascript_defs.php:35 templates/compose/compose.html:271
 msgid "File"
 msgstr "Fil"
 
-#: templates/filters/prefs.html:48
-msgid "Filter Options"
-msgstr "Filter-indstillinger"
-
-#: templates/filters/prefs.html:36
+#: templates/filters/prefs.html:2
 msgid "Filter Settings"
 msgstr "Filter-opsætning"
 
-#: config/prefs.php.dist:651
+#: config/prefs.php.dist:839
 msgid "Filter message content for profanity?"
 msgstr "Filtrer beskedens indhold for stærke ord."
 
-#: templates/filters/prefs.html:11
+#: templates/filters/prefs.html:7
 msgid "Filter support is disabled on this system."
 msgstr "Filter-understøttelse er slået fra på dette system."
 
-#: config/prefs.php.dist:131
+#: config/prefs.php.dist:161
 msgid "Filters"
 msgstr "Filtre"
 
-#: templates/filters/prefs.html:3
-msgid "Filters NOT Active"
-msgstr "Filtre IKKE aktiverede"
-
-#: lib/Filter.php:127
+#: lib/Filter.php:130
 #, php-format
 msgid "Filters: %s management page"
 msgstr "Filtre: %s håndteringsside"
@@ -1640,238 +1860,269 @@ msgstr "Filtre: %s h
 msgid "Find:"
 msgstr "Find:"
 
-#: config/prefs.php.dist:966
+#: config/prefs.php.dist:1189
 msgid "First Mailbox Page"
 msgstr "Første side"
 
-#: mailbox.php:432
+#: mailbox.php:278
 msgid "First Page"
 msgstr "Første side"
 
-#: mailbox.php:501 message.php:558
+#: mailbox.php:774 message.php:479 templates/message/navbar_navigate.html:10
+#: templates/mailbox/navbar.html:16 templates/mailbox/navbar.html:32
+msgid "Flagged For Followup"
+msgstr ""
+
+#: lib/Search.php:807
+msgid "Flagged messages"
+msgstr "Mærkede beskeder"
+
+#: mailbox.php:533 message.php:568
 msgid "Fo_rward"
 msgstr "Videresend"
 
-#: lib/IMAP/Tree.php:440
+#: lib/IMAP/Tree.php:2038 templates/folders/folders_size.html:6
 msgid "Folder"
 msgstr "Mappe"
 
-#: folders.php:216 templates/folders/folders_confirm.html:5
+#: folders.php:262 templates/folders/folders_confirm.html:6
 msgid "Folder Actions - Confirmation"
 msgstr "Mappe-handlinger - Bekræftelse"
 
-#: folders.php:249 templates/prefs/initialpageselect.inc:6
-#: templates/prefs/initialpageselect.inc:10 templates/folders/head.html:6
+#: folders.php:325 templates/prefs/initialpageselect.inc:11
+#: templates/folders/head.html:2
 msgid "Folder Navigator"
 msgstr "Mappenavigator"
 
+#: folders.php:282 templates/folders/folders_size.html:1
+msgid "Folder Sizes"
+msgstr "Mappestørrelser"
+
 #: lib/Block/summary.php:3
 msgid "Folder Summary"
 msgstr "Opsummering af mappe"
 
-#: acl.php:24
+#: acl.php:25
 msgid "Folder sharing is not enabled."
 msgstr "Deling af mapper ikke aktiveret."
 
-#: folders.php:24
+#: folders.php:46
 msgid "Folder use is not enabled."
 msgstr "Anvendelse af mapper er ikke aktiveret."
 
-#: config/prefs.php.dist:1030
+#: config/prefs.php.dist:630
+msgid "Font Color"
+msgstr "Skriftfarve"
+
+#: config/prefs.php.dist:1260
 msgid "Format of message dates in the mailbox view for messages dated today"
 msgstr "Formatet af datoer i brevbakke-visning for beskeder dateret i dag"
 
-#: mailbox.php:501 message.php:558 lib/Compose.php:1415
+#: mailbox.php:533 message.php:568 lib/Compose.php:1796
 msgid "Forward"
 msgstr "Videresend"
 
-#: lib/Compose.php:1401
+#: lib/Compose.php:1782
 msgid "Forward:"
 msgstr "Videresend:"
 
-#: lib/Compose.php:1468
+#: lib/Compose.php:1895
 msgid "Forwarded Message:"
 msgstr "Videresendt besked:"
 
-#: lib/Compose.php:1429
+#: lib/Compose.php:1809
 msgid "Forwarded message"
 msgstr "Videresendt besked"
 
-#: lib/Compose.php:1427
+#: lib/Compose.php:1807
 #, php-format
 msgid "Forwarded message from %s"
 msgstr "Videresendt besked fra %s"
 
-#: lib/MIME/Viewer/itip.php:405
+#: lib/MIME/Viewer/itip.php:437
 msgid "Free/Busy Request Response"
 msgstr "Ledig/optaget-anmodnings-svar"
 
-#: mailbox.php:575
+#: mailbox.php:592
 msgid "Fro_m"
 msgstr "Fra"
 
-#: message.php:228 thread.php:151 lib/Search.php:606
-#: templates/compose/compose.html:31
+#: lib/Search.php:711 lib/UI/Mailbox.php:99 lib/UI/Message.php:25
+#: templates/compose/compose.html:27
 msgid "From"
 msgstr "Fra"
 
-#: config/prefs.php.dist:979
+#: config/prefs.php.dist:1202
 msgid "From Address"
 msgstr "Fra adresse"
 
-#: lib/Compose.php:1412 lib/Compose.php:1416
-msgid "Fwd:"
-msgstr "Fwd:"
-
-#: lib/Compose.php:1479
-msgid "Fwd: "
-msgstr "VS: "
+#: templates/thread/thread.html:31
+msgid "From:"
+msgstr "Fra:"
 
-#: lib/Compose.php:1481
-#, php-format
-msgid "Fwd: %u Forwarded Messages"
-msgstr "VS: %u videresendte beskeder"
+#: templates/saveimage/saveimage.html:12
+msgid "Gallery"
+msgstr "Galleri"
 
-#: config/prefs.php.dist:13 config/prefs.php.dist:22 config/prefs.php.dist:30
-#: config/prefs.php.dist:38
+#: config/prefs.php.dist:14 config/prefs.php.dist:24 config/prefs.php.dist:34
+#: config/prefs.php.dist:42
 msgid "General Options"
 msgstr "Grundlæggende indstillinger"
 
-#: folders.php:298 lib/MIME/Viewer/itip.php:561 lib/MIME/Viewer/itip.php:735
-#: lib/MIME/Viewer/itip.php:858
+#: templates/fetchmail/fetchmailprefs.html:80
+msgid "Get only new messages? (IMAP only)"
+msgstr "Hent kune nye beskeder? (Kun IMAP)"
+
+#: folders.php:374 lib/MIME/Viewer/itip.php:650 lib/MIME/Viewer/itip.php:860
+#: lib/MIME/Viewer/itip.php:991
 msgid "Go"
 msgstr "Udfør"
 
-#: thread.php:134
+#: thread.php:136
 msgid "Go to Message"
 msgstr "Næste besked"
 
-#: lib/IMP.php:361
+#: templates/newmsg/alert.html:11
+msgid "Go to Virtual Inbox"
+msgstr "Gå til virtuel Indbakke"
+
+#: lib/IMP.php:404
 #, php-format
 msgid "Go to address book entry of \"%s\""
 msgstr "Vis \"%s\" i adressekartotek"
 
-#: templates/acl/acl.html:62
-msgid "Grant access"
-msgstr "Tildel adgang"
-
-#: message.php:425 lib/Filter.php:127 lib/MIME/Viewer/appledouble.php:41
-#: lib/MIME/Viewer/images.php:104 lib/MIME/Viewer/images.php:111
-#: lib/MIME/Viewer/images.php:113 lib/MIME/Viewer/images.php:164
-#: lib/MIME/Viewer/notification.php:61 lib/MIME/Viewer/notification.php:67
-#: lib/MIME/Viewer/pkcs7.php:424 lib/MIME/Viewer/related.php:78
-#: lib/MIME/Viewer/status.php:120 lib/MIME/Viewer/status.php:129
+#: message.php:447 lib/Filter.php:130 lib/MIME/Contents.php:449
+#: lib/MIME/Viewer/appledouble.php:48 lib/MIME/Viewer/images.php:90
+#: lib/MIME/Viewer/images.php:97 lib/MIME/Viewer/images.php:99
+#: lib/MIME/Viewer/notification.php:60 lib/MIME/Viewer/notification.php:67
+#: lib/MIME/Viewer/pkcs7.php:487 lib/MIME/Viewer/related.php:85
+#: lib/MIME/Viewer/status.php:119 lib/MIME/Viewer/status.php:128
 msgid "HERE"
 msgstr "HER"
 
-#: templates/stationery/prefs.inc:31 lib/MIME/Viewer/related.php:79
+#: lib/MIME/Viewer/related.php:86 templates/stationery/stationery.html:32
 msgid "HTML"
 msgstr "HTML"
 
-#: lib/Compose.php:355
+#: lib/Compose.php:477
 msgid "HTML Version of Message"
 msgstr "HTML-udgave af besked"
 
-#: message.php:687
+#: message.php:619
 msgid "Headers"
 msgstr "Overskrifter"
 
+#: config/prefs.php.dist:664
+msgid "Help using editor"
+msgstr ""
+
 #: templates/login/recompose.html:7
 msgid "Here is the message you were composing:"
 msgstr "Her er beskeden, som du skrev:"
 
-#: config/prefs.php.dist:719
+#: config/prefs.php.dist:912
 msgid "Hidden"
 msgstr "Skjult"
 
-#: config/prefs.php.dist:718
+#: config/prefs.php.dist:910
+msgid "Hidden in List Messages"
+msgstr "Skjult i beskedliste"
+
+#: config/prefs.php.dist:909
 msgid "Hidden in Thread View"
 msgstr "Skjult i tråd-visning"
 
-#: mailbox.php:274
+#: config/prefs.php.dist:911
+msgid "Hidden in Thread View and List Messages"
+msgstr "Skjult i tråd-visning"
+
+#: mailbox.php:259
 msgid "Hide Deleted"
 msgstr "Skjul slettede"
 
-#: folders.php:304
+#: folders.php:380
 msgid "Hide Unsubscribed"
 msgstr "Skjul deaktiverede"
 
-#: compose.php:1201
+#: compose.php:1041
 msgid "High"
 msgstr "Høj"
 
-#: mailbox.php:837 mailbox.php:986 message.php:260
-#: templates/mailbox/legend.html:10
+#: message.php:293
 msgid "High Priority"
 msgstr "Høj prioritet"
 
-#: compose.php:1200
+#: compose.php:1040
 msgid "Highest"
 msgstr "Højst"
 
-#: config/prefs.php.dist:747
+#: config/prefs.php.dist:643
+msgid "Horizontal Rule"
+msgstr "Vandret streg"
+
+#: config/prefs.php.dist:940
 msgid "How do you want to display attachments?"
 msgstr "Hvordan vil du vise vedhæftelser?"
 
-#: config/prefs.php.dist:556
+#: config/prefs.php.dist:1281
+msgid "How should namespaces be displayed in the folder tree view?"
+msgstr ""
+
+#: config/prefs.php.dist:792
 msgid "How to attribute quoted lines in a reply"
 msgstr "Hvilket præfiks sættes foran den citerede tekst i et svar:"
 
-#: lib/IMAP.php:194
+#: lib/IMAP.php:309
 msgid "IMAP"
 msgstr "IMAP"
 
-#: lib/Fetchmail/imap.php:107
+#: lib/Fetchmail/imap.php:97
 msgid "IMAP (Auto Detect Protocols)"
-msgstr "IMAP (opdag protokoller automatisk)"
+msgstr "IMAP (bestem protokoller automatisk)"
 
-#: lib/IMAP/Client.php:391
+#: lib/IMAP.php:315
+msgid "IMAP (self-signed certificate)"
+msgstr "IMAP (selv-signeret certifikat)"
+
+#: lib/IMAP/Client.php:200
 #, php-format
 msgid "IMAP Server closed the connection. Server Responded: %s"
 msgstr "IMAP-server lukkede forbindelsen. Server svarede: %s"
 
-#: lib/IMAP.php:206
+#: lib/IMAP.php:327
 msgid "IMAP over SSL"
 msgstr "IMAP over SSL"
 
-#: lib/IMAP.php:212
+#: lib/IMAP.php:333
 msgid "IMAP over SSL (self-signed certificate)"
 msgstr "IMAP over SSL (selv-signeret certifikat)"
 
-#: lib/IMAP/Client.php:368
-msgid "IMAP server closed the connection."
-msgstr "IMAP-server lukkede forbindelsen."
-
-#: lib/IMAP.php:200
+#: lib/IMAP.php:321
 msgid "IMAP, no TLS"
 msgstr "IMAP, ingen TLS"
 
-#: lib/Fetchmail/imap.php:49
+#: lib/Fetchmail/imap.php:47
 msgid "IMAP/POP3 Mail Servers"
 msgstr "IMAP/POP3 mail-servere"
 
-#: lib/IMAP/Client.php:411
+#: lib/IMAP/Client.php:283
 msgid "If using SSL or TLS, you must have the PHP openssl extension loaded."
 msgstr ""
-"Hvis SSL eller TLS benyttes, skal du have PHP openssl udviddelsen læsset."
+"Hvis SSL eller TLS benyttes, skal du have PHP openssl udvidelsen indlæst."
 
-#: templates/folders/folders_confirm.html:12
+#: templates/folders/folders_confirm.html:13
 msgid "If you continue, all messages in the folder(s) will be lost!"
 msgstr "Hvis du fortsætter, vil du miste alle beskeder i mappen/mapperne!"
 
-#: templates/compose/spelling.html:36
-msgid "Ignore"
-msgstr "Ignorer"
-
-#: templates/compose/spelling.html:37
-msgid "Ignore All"
-msgstr "Ignorer alt"
-
-#: saveimage.php:46
+#: saveimage.php:48
 msgid "Image"
 msgstr "Billede"
 
-#: templates/folders/import.html:16
+#: lib/MIME/Viewer/html.php:160
+msgid "Images have been blocked to protect your privacy."
+msgstr "Billeder er blokeret for at beskytte dit privatliv."
+
+#: templates/folders/import.html:17
 msgid "Import"
 msgstr "Importér"
 
@@ -1879,15 +2130,15 @@ msgstr "Import
 msgid "Import Key"
 msgstr "Importér nøgle"
 
-#: templates/smime/smime.html:79 templates/pgp/pgp.html:131
+#: templates/smime/smime.html:81 templates/pgp/pgp.html:131
 msgid "Import Keypair"
 msgstr "Importér nøglepar"
 
-#: templates/folders/actions.html:30
+#: templates/folders/actions.html:37
 msgid "Import Messages"
 msgstr "Importér beskeder"
 
-#: pgp.php:47
+#: pgp.php:50
 msgid "Import PGP Key"
 msgstr "Importér PGP-nøgle"
 
@@ -1907,7 +2158,11 @@ msgstr "Import
 msgid "Import Personal Public PGP Key Here:"
 msgstr "Importér egen, offentlig PGP-nøgle her:"
 
-#: templates/smime/smime.html:41 templates/pgp/pgp.html:49
+#: templates/smime/import_key.html:11
+msgid "Import Personal S/MIME Certificates"
+msgstr "Importer egne S/MIME-certifikater"
+
+#: templates/smime/smime.html:47 templates/pgp/pgp.html:55
 msgid "Import Public Key"
 msgstr "Importér offentlig nøgle"
 
@@ -1923,135 +2178,192 @@ msgstr "Import
 msgid "Import Public S/MIME Key"
 msgstr "Importér offentlig S/MIME-nøgle"
 
-#: smime.php:14
+#: smime.php:16
 msgid "Import S/MIME Key"
 msgstr "Importér S/MIME-nøgle"
 
-#: templates/folders/import.html:6
+#: templates/folders/import.html:7
 msgid "Import mbox File"
 msgstr "Importér mbox-fil"
 
-#: templates/folders/import.html:11
+#: templates/folders/import.html:12
 msgid "Import mbox file"
 msgstr "Importér mbox-fil"
 
-#: mailbox.php:845 mailbox.php:981 message.php:471
-#: templates/message/navbar_navigate.html:7 templates/mailbox/legend.html:5
-#: templates/mailbox/navbar.html:13 templates/mailbox/navbar.html:28
-msgid "Important"
-msgstr "Vigtigt"
-
-#: search.php:344
-msgid "Important messages"
-msgstr "Vigtige beskeder"
-
-#: folders.php:115
+#: folders.php:150
 #, php-format
 msgid "Imported %d messages from %s."
 msgstr "%d beskeder importeret fra %s."
 
-#: lib/MIME/Viewer/itip.php:896
+#: pgp.php:179
+msgid ""
+"Imported key contains your PGP private key. Only add your public key in the "
+"first step!"
+msgstr ""
+"Den importerede nøgle indeholder din private PGP nøgle. Du bør kun tilføje "
+"din offentlige nøgle i føste skridt!"
+
+#: lib/MIME/Viewer/itip.php:1029
 msgid "In Process"
 msgstr "Processen kører"
 
-#: templates/prefs/initialpageselect.inc:14 lib/Folder.php:85 lib/IMP.php:682
-#: lib/IMAP/Tree.php:127 lib/IMAP/Tree.php:230 lib/IMAP/Tree.php:375
+#: templates/prefs/initialpageselect.inc:4 lib/Folder.php:68 lib/IMP.php:732
+#: lib/IMP.php:742 lib/api.php:293 lib/IMAP/Tree.php:410
+#: lib/IMAP/Tree.php:1976
 msgid "Inbox"
 msgstr "Indbakke"
 
-#: config/prefs.php.dist:544
+#: config/prefs.php.dist:780
 msgid "Include a brief summary of the header in a reply?"
 msgstr "Medtag en kort sammendrag af brevhoveder i en besvarelse?"
 
-#: config/prefs.php.dist:539
+#: config/prefs.php.dist:775
+msgid "Include body text in forward message by default?"
+msgstr "Medtag beskedteksten ved videresendelse?"
+
+#: config/prefs.php.dist:746
 msgid "Include original message in a reply?"
 msgstr "Medtag oprindelig besked i en besvarelse?"
 
-#: lib/MIME/Viewer/notification.php:60 lib/MIME/Viewer/status.php:132
+#: config/prefs.php.dist:642
+msgid "Increase Indent"
+msgstr "Forøg indrykning"
+
+#: lib/MIME/Viewer/notification.php:59 lib/MIME/Viewer/status.php:131
 msgid "Info"
 msgstr "Info"
 
-#: pgp.php:369 smime.php:295
+#: pgp.php:418 smime.php:319
 #, php-format
 msgid "Information on %s Public Key"
 msgstr "Information om %s offentlig nøgle"
 
-#: pgp.php:398
+#: pgp.php:449
 msgid "Information on Personal Private Key"
 msgstr "Information om egen, private nøgle"
 
-#: pgp.php:392 smime.php:318
+#: pgp.php:443 smime.php:344
 msgid "Information on Personal Public Key"
 msgstr "Information om egen, offentlig nøgle"
 
-#: templates/javascript/compose.js:28 templates/javascript/src/compose.js:250
-#: templates/compose/compose.html:272 templates/compose/compose.html:328
+#: templates/javascript_defs.php:37 templates/compose/compose.html:277
+#: templates/compose/compose.html:336
 msgid "Inline"
 msgstr "Indlejret"
 
+#: lib/IMAP/ACL/rfc2086.php:53 lib/IMAP/ACL/rfc4314.php:53
+msgid "Insert"
+msgstr "Indsæt"
+
 #: templates/smime/import_key.html:19
 msgid "Insert Certificate Here:"
 msgstr "Indsæt certifikat her:"
 
-#: lib/MIME/Viewer/itip.php:416
+#: config/prefs.php.dist:646
+msgid "Insert Table"
+msgstr "Indsæt tabel"
+
+#: config/prefs.php.dist:644
+msgid "Insert Web Link"
+msgstr "Indsæt web lænke"
+
+#: config/prefs.php.dist:645
+msgid "Insert/Modify Image"
+msgstr "Indsæt billede"
+
+#: config/prefs.php.dist:654
+msgid "Insert/Overwrite"
+msgstr "Indsæt/overskriv"
+
+#: lib/MIME/Viewer/itip.php:451
 msgid "Invalid Action selected for this component."
 msgstr "Ugyldig handling valgt for denne komponent."
 
-#: mailbox.php:728 mailbox.php:775
+#: lib/UI/Mailbox.php:62 lib/UI/Mailbox.php:113
 msgid "Invalid Address"
 msgstr "Ugyldig adresse"
 
-#: lib/Fetchmail/imap.php:261
+#: lib/Fetchmail/imap.php:225
 msgid "Invalid Remote Mailbox"
 msgstr "Ugyldig fjern brevbakke"
 
-#: lib/Compose.php:1027
+#: lib/Compose.php:1189 lib/Compose.php:1204 lib/Compose.php:1216
+#: lib/Compose.php:1231
 #, php-format
 msgid "Invalid character in e-mail address: %s."
 msgstr "Ugyldigt tegn i e-mail-adresse: %s."
 
-#: pgp.php:16 smime.php:94
+#: lib/Compose.php:1181
+#, php-format
+msgid "Invalid e-mail address: %s."
+msgstr "Ugyldig e-mail-adresse: %s."
+
+#: lib/Compose.php:1200 lib/Compose.php:1227
+msgid "Invalid hostname."
+msgstr "Ugyldigt servernavn."
+
+#: pgp.php:18 smime.php:101
 msgid "Invalid key"
 msgstr "Ugyldig nøgle"
 
-#: lib/Compose.php:198
-msgid "Invalid message, can not resume draft."
-msgstr "Ugyldig besked; kan ikke genoptage kladde."
+#: lib/Compose.php:296
+msgid "Invalid message, cannot resume draft."
+msgstr "Ugyldig besked, kan ikke genoptage kladde."
 
-#: pgp.php:199
+#: pgp.php:215
 msgid "Invalid personal PGP private key."
 msgstr "Ugyldig egen, privat PGP-nøgle."
 
-#: pgp.php:174
+#: pgp.php:191
 msgid "Invalid personal PGP public key."
 msgstr "Ugyldig egen, offentlig PGP-nøgle."
 
-#: templates/mailbox/navbar.html:9
+#: templates/mailbox/navbar.html:12
 msgid "Invert"
 msgstr "Invertér"
 
-#: templates/compose/compose.html:316 templates/compose/compose.html:351
+#: config/prefs.php.dist:627
+msgid "Italic"
+msgstr "Kursiv"
+
+#: config/prefs.php.dist:636
+msgid "Justify Center"
+msgstr "Centreret"
+
+#: config/prefs.php.dist:638
+msgid "Justify Full"
+msgstr "Fast bredde"
+
+#: config/prefs.php.dist:635
+msgid "Justify Left"
+msgstr "Venstrejusteret"
+
+#: config/prefs.php.dist:637
+msgid "Justify Right"
+msgstr "Højrejusteret"
+
+#: templates/compose/compose.html:317 templates/compose/compose.html:325
 msgid "KB"
 msgstr "KB"
 
-#: templates/pgp/pgp.html:104
+#: templates/pgp/pgp.html:107
 msgid "Key Length:"
 msgstr "Nøglelængde:"
 
-#: pgp.php:412
+#: pgp.php:463
 msgid ""
 "Key generation may take a long time to complete.  Continue with key "
 "generation?"
 msgstr ""
 "Nøgle-generering kan tage meget lang tid.  Fortsæt med nøgle-generering?"
 
-#: templates/smime/smime.html:36 templates/pgp/pgp.html:44
+#: templates/smime/smime.html:42 templates/pgp/pgp.html:50
 msgid "Key import is not available. File upload is not enabled on this server."
 msgstr ""
 "Nøgle-importering ikke tilgængelig.  Hentning af filer er ikke aktiveret på "
 "denne server."
 
-#: templates/smime/smime.html:39 templates/pgp/pgp.html:47
+#: templates/smime/smime.html:45 templates/pgp/pgp.html:53
 msgid ""
 "Key import is not available. You have no address book defined to add your "
 "contacts."
@@ -2059,36 +2371,44 @@ msgstr ""
 "Nøgle-importering ikke tilgængelig. Du har ikke defineret noget "
 "adressekartotek, hvor dine kontakter til tilføjes."
 
-#: pgp.php:321
+#: pgp.php:355
 msgid "Key successfully sent to the public keyserver."
 msgstr "Nøgle er sendt til offentlig nøgle-server."
 
-#: templates/login/login.html:113
+#: templates/login/login.html:116
 msgid "Language"
 msgstr "Sprog"
 
-#: config/prefs.php.dist:967
+#: login.php:299
+msgid "Language:"
+msgstr "Sprog:"
+
+#: config/prefs.php.dist:1190
 msgid "Last Mailbox Page"
 msgstr "Sidste e-mail side"
 
-#: mailbox.php:444
+#: mailbox.php:290
 msgid "Last Page"
 msgstr "Sidste side"
 
-#: compose.php:1324
+#: compose.php:1192
 msgid "Link Attachments?"
 msgstr "Henvis til vedhæftelser?"
 
-#: attachment.php:34 lib/Compose.php:2210
+#: attachment.php:35 lib/Compose.php:2600
 msgid "Linked attachments are forbidden."
 msgstr "Refererede vedhæftelser er forbudt."
 
-#: lib/Compose.php:2226
+#: lib/Compose.php:2616
 #, php-format
 msgid "Links will expire on %s"
 msgstr "Henvisninger udløber den %s"
 
-#: config/prefs.php.dist:1154
+#: lib/IMAP/ACL/rfc2086.php:49 lib/IMAP/ACL/rfc4314.php:49
+msgid "List"
+msgstr "Liste"
+
+#: config/prefs.php.dist:1379
 msgid ""
 "List all contacts when loading the contacts screen? (if disabled, you will "
 "only see contacts that you search for explicitly)"
@@ -2096,105 +2416,138 @@ msgstr ""
 "List alle kontakter, når kontakt-siden hentes? (hvis slået fra vil du kun se "
 "de kontakter, som du søger efter)"
 
-#: config/prefs.php.dist:744
+#: config/prefs.php.dist:937
 msgid "Listing in the Header"
 msgstr "Fortegnelse iblandt brevhovederne"
 
-#: lib/MIME/Viewer/itip.php:678
+#: compose.php:812
+msgid "Loading..."
+msgstr "Henter..."
+
+#: templates/fetchmail/fetchmailprefs.html:72
+msgid "Local Mailbox:"
+msgstr "Mailbox"
+
+#: lib/MIME/Viewer/itip.php:804
 msgid "Location"
 msgstr "Sted"
 
-#: lib/Block/summary.php:105
+#: templates/login/mobile.inc:3 templates/login/mobile.inc:37
+msgid "Log in"
+msgstr "Log ind"
+
+#: lib/Block/summary.php:45
 #, php-format
 msgid "Log in to %s"
 msgstr "Log ind på %s"
 
-#: login.php:352
+#: login.php:426
 msgid "Login"
 msgstr "Log ind"
 
-#: config/prefs.php.dist:39
+#: config/prefs.php.dist:43
 msgid "Login Tasks"
 msgstr "Login-opgaver"
 
-#: compose.php:1203
+#: compose.php:1043
 msgid "Low"
 msgstr "Lav"
 
-#: mailbox.php:840 mailbox.php:987 message.php:262
-#: templates/mailbox/legend.html:11
+#: message.php:297
 msgid "Low Priority"
 msgstr "Lav prioritet"
 
-#: compose.php:1204
+#: compose.php:1044
 msgid "Lowest"
 msgstr "Laveste"
 
-#: lib/MIME/Viewer/appledouble.php:44
+#: lib/MIME/Viewer/appledouble.php:51
 msgid "Macintosh File"
 msgstr "Macintosh-fil"
 
-#: config/prefs.php.dist:100
+#: config/prefs.php.dist:130
 msgid "Mail Previews"
 msgstr "Forhåndsvisning af e-mail"
 
-#: lib/IMAP/Tree.php:382 lib/IMAP/Tree.php:409
+#: templates/fetchmail/fetchmailprefs.html:31
+msgid "Mail server type to connect to:"
+msgstr "Servertype der skal forbindes til:"
+
+#: lib/IMAP/Tree.php:1983 lib/IMAP/Tree.php:2010
 msgid "Mailbox"
 msgstr "Mailbox"
 
-#: config/prefs.php.dist:115
+#: config/prefs.php.dist:148
 msgid "Mailbox and Folder Display Options"
 msgstr "Indstillingerne for e-mail- og mappe-visning"
 
-#: templates/folders/actions.html:25
+#: lib/IMAP/ACL/rfc2086.php:52 lib/IMAP/ACL/rfc4314.php:52
+msgid "Mark (Other)"
+msgstr "Mærke (Andet)"
+
+#: lib/IMAP/ACL/rfc2086.php:51 lib/IMAP/ACL/rfc4314.php:51
+msgid "Mark (Seen)"
+msgstr "Mærke (Set)"
+
+#: templates/folders/actions.html:32
 msgid "Mark All Messages as Seen"
 msgstr "Markér alle beskeder som set"
 
-#: templates/folders/actions.html:26
+#: templates/folders/actions.html:33
 msgid "Mark All Messages as Unseen"
 msgstr "Markér alle beskeder som uset"
 
-#: templates/message/navbar_navigate.html:5 templates/mailbox/navbar.html:25
+#: templates/message/navbar_navigate.html:6
+#: templates/message/navbar_navigate.html:8 templates/mailbox/navbar.html:27
+#: templates/mailbox/navbar.html:29
 msgid "Mark as:"
 msgstr "Marker som:"
 
-#: config/prefs.php.dist:701
+#: config/prefs.php.dist:892
 msgid "Mark different levels of quoting with different colors?"
 msgstr "Markér forskellige citat-niveauer med forskellige farver?"
 
-#: config/prefs.php.dist:709
+#: templates/fetchmail/fetchmailprefs.html:83
+msgid "Mark messages as seen? (IMAP only)"
+msgstr "Markér alle beskeder som set? (Kun IMAP)"
+
+#: config/prefs.php.dist:900
 msgid "Mark simple markup?"
 msgstr "Markér simplificeret opmærkning?"
 
-#: search.php:222
+#: search.php:165
 msgid "Match All Queries"
 msgstr "Passer til alle forespørgsler"
 
-#: search.php:220
+#: search.php:163
 msgid "Match Any Query"
 msgstr "Passer til nogen af forespørgslerne"
 
-#: templates/compose/compose.html:278
+#: config/prefs.php.dist:622
+msgid "Maximize/Minimize Editor"
+msgstr ""
+
+#: templates/compose/compose.html:283
 msgid "Maximum Attachment Size"
 msgstr "Størrelse på største vedhæftelse"
 
-#: lib/api.php:84
+#: lib/api.php:101
 msgid "Maximum Number of Folders"
 msgstr "Maksimalt antal mapper"
 
-#: lib/api.php:87
+#: lib/api.php:102
 msgid "Maximum Number of Recipients per Message"
 msgstr "Maksimalt antal modtagere pr. besked"
 
-#: lib/api.php:90
+#: lib/api.php:103
 msgid "Maximum Number of Recipients per Time Period"
 msgstr "Maksimalt antal modtagere pr. tidsperiode"
 
-#: templates/compose/compose.html:260
+#: templates/compose/compose.html:265
 msgid "Maximum number of attachments reached."
 msgstr "Maksimalt antal vedhæftelser nået."
 
-#: templates/compose/compose.html:255
+#: templates/compose/compose.html:262
 msgid "Maximum total attachment size reached."
 msgstr "Maksimalt total størrelse af vedhæftelse nået."
 
@@ -2202,98 +2555,120 @@ msgstr "Maksimalt total st
 msgid "Menu Folder List"
 msgstr "Menu-mappe-liste"
 
-#: lib/Compose.php:1355
+#: lib/Compose.php:1696
 msgid "Message"
 msgstr "Besked"
 
-#: compose.php:343 compose.php:373 compose.php:381 config/prefs.php.dist:52
+#: config/prefs.php.dist:63
 msgid "Message Composition"
 msgstr "Skrivning af ny besked"
 
-#: config/prefs.php.dist:978
+#: config/prefs.php.dist:1201
 msgid "Message Date"
 msgstr "Dato"
 
-#: config/prefs.php.dist:51 config/prefs.php.dist:68 config/prefs.php.dist:82
-#: config/prefs.php.dist:91 config/prefs.php.dist:99 config/prefs.php.dist:107
+#: config/prefs.php.dist:87
+msgid "Message Drafts"
+msgstr "Beskedkladder"
+
+#: config/prefs.php.dist:62 config/prefs.php.dist:78 config/prefs.php.dist:86
+#: config/prefs.php.dist:93 config/prefs.php.dist:108
+#: config/prefs.php.dist:121 config/prefs.php.dist:129
+#: config/prefs.php.dist:138
 msgid "Message Options"
 msgstr "Besked-indstillinger"
 
-#: search.php:419
+#: config/prefs.php.dist:79
+msgid "Message Replies/Forwards"
+msgstr "Besked svar/videresendelser"
+
+#: search.php:338
 msgid "Message Search"
 msgstr "Søgning"
 
-#: config/prefs.php.dist:982
+#: config/prefs.php.dist:1205
 msgid "Message Size"
 msgstr "Størrelse"
 
-#: message.php:582
+#: message.php:589
 msgid "Message Source"
 msgstr "Oprindelse"
 
-#: config/prefs.php.dist:69
+#: config/prefs.php.dist:94
 msgid "Message Viewing"
 msgstr "Visning"
 
-#: lib/Compose.php:1353
+#: lib/Compose.php:1694
 #, php-format
 msgid "Message from %s"
 msgstr "Besked fra %s"
 
-#: mailbox.php:875
+#: lib/UI/Mailbox.php:151
 msgid "Message has attachments"
 msgstr "Besked har vedhæftelser"
 
-#: mailbox.php:867
+#: lib/UI/Mailbox.php:150
 msgid "Message is encrypted"
 msgstr "Besked er krypteret"
 
-#: mailbox.php:863
+#: lib/UI/Mailbox.php:149
 msgid "Message is signed"
 msgstr "Besked er signeret"
 
-#: compose.php:495 compose.php:502
+#: compose.php:390 compose.php:397
 msgid "Message redirected successfully."
 msgstr "Besked omadresseret."
 
-#: lib/Compose.php:655
+#: lib/Compose.php:834
 #, php-format
 msgid "Message sent successfully, but not saved to %s"
 msgstr "Beskeden blev sendt, men kunne ikke gemmes i %s"
 
-#: compose.php:562 compose.php:570
+#: compose.php:461 compose.php:469
 msgid "Message sent successfully."
 msgstr "Beskeden er sendt."
 
-#: config/prefs.php.dist:1002
+#: config/prefs.php.dist:1232
 msgid "Messages per page in the mailbox view."
 msgstr "Beskeder per side i brevbakkevisningen."
 
-#: mailbox.php:246
+#: mailbox.php:225
 msgid "Messages to"
 msgstr "Beskeder til"
 
-#: templates/javascript/acl.js:2 templates/javascript/src/acl.js:37
-msgid "Modify"
-msgstr "Ændre"
+#: login.php:270
+msgid "Minimalist"
+msgstr "Minimalistisk"
+
+#: templates/login/login.html:129
+msgid "Mode"
+msgstr "Tilstand"
 
-#: mailbox.php:419 mailbox.php:1006 message.php:507 message.php:699
+#: login.php:308
+msgid "Mode:"
+msgstr "Tilstand:"
+
+#: templates/search/search.html:93
+msgid "Month"
+msgstr "Måned"
+
+#: mailbox.php:485 mailbox.php:894 message.php:519 message.php:706
 msgid "Move"
 msgstr "Flyt"
 
-#: templates/prefs/sourceselect.inc:316
+#: templates/prefs/sourceselect.inc:314
 msgid "Move down"
 msgstr "Flyt ned"
 
-#: config/prefs.php.dist:669
+#: config/prefs.php.dist:862
 msgid "Move spam messages to spam folder and innocent messages to INBOX"
 msgstr "Flyt spam-beskeder til spam-mappe og ordentlige beskeder til Indbakke"
 
-#: mailbox.php:419 mailbox.php:1006 message.php:507 message.php:699
+#: mailbox.php:485 mailbox.php:894 message.php:519 message.php:706
 msgid "Move to folder"
 msgstr "Vælg mappe"
 
-#: templates/prefs/sourceselect.inc:314
+#: templates/prefs/sourceselect.inc:312
 msgid "Move up"
 msgstr "Flyt op"
 
@@ -2301,368 +2676,370 @@ msgstr "Flyt op"
 msgid "Multipart/alternative"
 msgstr "Multipart/alternative"
 
-#: thread.php:75 thread.php:154
+#: thread.php:177
 msgid "Multiple Message View"
 msgstr "Visningi med multiple beskeder"
 
-#: expand.php:40
-msgid "Multiple matches"
-msgstr "Flere resultater"
-
-#: templates/prefs/defaultsearchselect.inc:8
-msgid "NONE"
-msgstr "INGEN"
+#: templates/thread/thread.html:2
+msgid "Multiple Message View:"
+msgstr "Visning med multiple beskeder"
 
 #: templates/smime/smime.html:4 templates/pgp/pgp.html:4
+#: templates/fetchmail/fetchmailprefs.html:91
 msgid "NOTE:"
 msgstr "BEMÆRK:"
 
-#: lib/MIME/Viewer/itip.php:690 lib/MIME/Viewer/itip.php:813
-#: templates/contacts/contacts.html:58
+#: lib/MIME/Viewer/itip.php:810 lib/MIME/Viewer/itip.php:942
 msgid "Name"
 msgstr "Navn"
 
-#: pgp.php:113
+#: pgp.php:120
 msgid "Name and/or email cannot be empty"
 msgstr "Navn og/eller e-mail kan ikke være tomme"
 
-#: lib/MIME/Viewer/itip.php:901
+#: lib/MIME/Viewer/itip.php:1034
 msgid "Needs Action"
 msgstr "Handling nødvendig"
 
-#: config/prefs.php.dist:633 config/prefs.php.dist:840
+#: config/prefs.php.dist:728 config/prefs.php.dist:1057
 msgid "Never"
 msgstr "Aldrig"
 
-#: config/prefs.php.dist:623
+#: config/prefs.php.dist:718
 msgid "Never save attachments"
 msgstr "Gem aldrig vedhæftelser"
 
-#: templates/acl/acl.html:48
-msgid "New"
-msgstr "Ny"
-
-#: lib/IMP.php:453
+#: lib/IMP.php:490
 msgid "New Folder"
 msgstr "Ny mappe"
 
-#: config/prefs.php.dist:92
+#: config/prefs.php.dist:122
 msgid "New Mail"
 msgstr "Ny e-mail"
 
-#: lib/Block/summary.php:26 lib/Block/summary.php:27
-#: lib/Block/tree_folders.php:31
+#: compose.php:33 compose.php:252 lib/Block/tree_folders.php:35
 msgid "New Message"
 msgstr "Ny besked"
 
-#: mailbox.php:928 lib/MIME/Headers.php:193
+#: mailbox.php:854 lib/MIME/Headers.php:212 lib/MIME/Headers.php:235
 #, php-format
 msgid "New Message to %s"
-msgstr "Nye beskeder til %s"
+msgstr "Ny besked til %s"
 
-#: search.php:335
-msgid "New messages"
-msgstr "Nye beskeder"
-
-#: templates/compose/spelling.html:73
-msgid "Next"
-msgstr "Næste"
-
-#: message.php:525 message.php:706
+#: message.php:535
 msgid "Next Message"
 msgstr "Næste besked"
 
-#: mailbox.php:442
+#: mailbox.php:288
 msgid "Next Page"
 msgstr "Næste side"
 
-#: config/prefs.php.dist:581 config/prefs.php.dist:1038
-#: config/prefs.php.dist:1049 templates/compose/compose.html:298
+#: templates/javascript_defs.php:44 config/prefs.php.dist:823
+#: config/prefs.php.dist:1268 config/prefs.php.dist:1290
+#: templates/compose/compose.html:303
 msgid "No"
 msgstr "Nej"
 
-#: smime.php:238
+#: smime.php:246
 msgid "No Certificate found"
 msgstr "Intet certifikat fundet"
 
-#: lib/IMP.php:1341
+#: lib/IMP.php:1447
 msgid "No Encryption"
 msgstr "Ingen kryptering"
 
-#: templates/smime/smime.html:16 templates/pgp/pgp.html:25
+#: templates/smime/smime.html:26 templates/pgp/pgp.html:34
 msgid "No Keys in Keyring"
 msgstr "Ingen nøgler i nøglering"
 
-#: mailbox.php:282
+#: mailbox.php:267 rss.php:86
 #, php-format
 msgid "No Messages"
 msgstr "Ingen beskeder"
 
-#: pgp.php:140
+#: pgp.php:147
 msgid "No PGP public key imported."
 msgstr "Ingen offentlig PGP-nøgle importeret."
 
-#: mailbox.php:885
+#: mailbox.php:815
 msgid "No Preview Text"
 msgstr "Ingen tekst til forhåndsvisning"
 
-#: smime.php:163
+#: smime.php:171
 msgid "No S/MIME public key imported."
 msgstr "Ingen offentlige S/MIME-nøgler importeret."
 
-#: templates/fetchmail/fetchmail.html:22
-msgid "No accounts available to fetch mail from."
-msgstr "Ingen tilgængelige konti, der skal hentes e-post fra med fetchmail."
+#: templates/prefs/soundselect.inc:5
+msgid "No Sound"
+msgstr "Ingen lyd"
 
-#: lib/MIME/Viewer/tnef.php:92
+#: lib/MIME/Viewer/tnef.php:91
 msgid "No attachments found."
 msgstr "Ingen vedhæftelser fundet."
 
-#: lib/Crypt/SMIME.php:140
+#: lib/Crypt/SMIME.php:131
 msgid "No email information located in the public key."
 msgstr "Ingen e-mail-information lokaliseret i offentlig nøgle."
 
-#: acl.php:72 acl.php:98
+#: acl.php:76
 msgid "No folder selected."
 msgstr "Ingen mappe valgt."
 
-#: lib/Block/summary.php:135
+#: lib/Block/summary.php:134
 msgid "No folders are being checked for new mail."
 msgstr "Ingen mapper bliver checket for ny post."
 
-#: folders.php:165 lib/Folder.php:477 lib/Folder.php:527
+#: folders.php:199 lib/Folder.php:423 lib/Folder.php:471
 msgid "No folders were specified"
 msgstr "Ingen mapper angivet"
 
-#: lib/Block/summary.php:141
+#: lib/Block/summary.php:138
 msgid "No folders with new messages"
 msgstr "Ingen mapper med nye beskeder"
 
-#: lib/Block/summary.php:138
+#: lib/Block/summary.php:136
 msgid "No folders with unseen messages"
 msgstr "Ingen mapper med ulæste beskeder"
 
-#: expand.php:38
-msgid "No matches"
-msgstr "Ingen resultater"
+#: lib/IMP.php:1048
+msgid "No limit"
+msgstr "Ubegrænset"
 
-#: lib/Compose.php:1349
+#: lib/Compose.php:1732
 msgid "No message body text"
 msgstr "Ingen brødtekst"
 
-#: lib/IMAP/Client.php:568
+#: lib/IMAP/Client.php:474
 msgid "No message returned."
 msgstr "Ingen besked returneret."
 
-#: mailbox.php:260
+#: mailbox.php:240
 msgid "No messages matched your search."
 msgstr "Din søgning gav ingen beskeder"
 
-#: pgp.php:192
+#: pgp.php:220
 msgid "No personal PGP private key imported."
 msgstr "Ingen egen, privat PGP-nøgle importeret."
 
-#: pgp.php:168
+#: pgp.php:196
 msgid "No personal PGP public key imported."
 msgstr "Ingen egen, offentlig PGP-nøgle importeret."
 
-#: smime.php:213
+#: smime.php:221
 msgid "No personal S/MIME certificates imported."
 msgstr "Intet eget S/MIME-certificat importeret."
 
-#: lib/MIME/Viewer/pkcs7.php:246
+#: lib/MIME/Viewer/pkcs7.php:305
 msgid ""
 "No personal private key exists so the message is unable to be decrypted."
 msgstr ""
 "Der findes ingen personlig, privat nøgle, så beskeden kan ikke dekrypteres."
 
-#: spelling.php:190
-msgid "No spellchecking program configured."
-msgstr "Der er ikke konfigureret noget program til stavekontrol."
-
-#: compose.php:990
-msgid "No suggestions"
-msgstr "Ingen forslag"
-
-#: lib/IMAP/Client.php:560
+#: lib/IMAP/Client.php:374
 msgid "No supported IMAP authentication method could be found."
 msgstr "Ingen understøttet IMAP ægtningsmetode fundet."
 
-#: acl.php:68 acl.php:94
+#: acl.php:108
 msgid "No user specified."
 msgstr "Ingen bruger angivet."
 
-#: lib/MIME/Viewer/itip.php:711 lib/MIME/Viewer/itip.php:834
+#: lib/MIME/Viewer/itip.php:831 lib/MIME/Viewer/itip.php:963
 msgid "Non Participant"
 msgstr "Ej deltager"
 
-#: templates/prefs/folderselect.inc:24 templates/prefs/sentmailselect.inc:40
-#: templates/prefs/sourceselect.inc:35 templates/prefs/spamselect.inc:24
-#: templates/prefs/trashselect.inc:24 lib/MIME/Viewer/itip.php:668
-#: lib/MIME/Viewer/itip.php:796 templates/mailbox/navbar.html:8
+#: templates/prefs/folderselect.inc:21 templates/prefs/sentmailselect.inc:38
+#: templates/prefs/sourceselect.inc:35 templates/prefs/spamselect.inc:20
+#: templates/prefs/trashselect.inc:23 lib/MIME/Viewer/itip.php:794
+#: lib/MIME/Viewer/itip.php:925 templates/mailbox/navbar.html:11
 msgid "None"
 msgstr "Ingen"
 
-#: compose.php:1202
+#: compose.php:1042
 msgid "Normal"
 msgstr "Normal"
 
-#: templates/mailbox/navbar.html:18 templates/mailbox/navbar.html:34
+#: templates/mailbox/navbar.html:21 templates/mailbox/navbar.html:38
 msgid "Not Deleted"
 msgstr "Ikke slettet"
 
-#: templates/message/navbar_navigate.html:12 templates/mailbox/navbar.html:20
-#: templates/mailbox/navbar.html:37
+#: templates/message/navbar_navigate.html:15 templates/mailbox/navbar.html:23
+#: templates/mailbox/navbar.html:41
 msgid "Not Draft"
 msgstr "Ikke kladde"
 
-#: templates/message/navbar_navigate.html:8 templates/mailbox/navbar.html:14
-#: templates/mailbox/navbar.html:29
-msgid "Not Important"
-msgstr "Ikke vigtigt"
+#: templates/message/navbar_navigate.html:11 templates/mailbox/navbar.html:17
+#: templates/mailbox/navbar.html:33
+msgid "Not Flagged"
+msgstr "Ikke mærket"
 
-#: templates/mailbox/navbar.html:22
+#: templates/mailbox/navbar.html:25
 msgid "Not Personal"
 msgstr "Ikke personligt"
 
-#: lib/Crypt/PGP.php:139 lib/Crypt/SMIME.php:134 lib/Crypt/SMIME.php:149
+#: lib/Crypt/SMIME.php:125 lib/Crypt/SMIME.php:140 lib/Crypt/PGP.php:136
 msgid "Not a valid public key."
 msgstr "Ikke en gyldig offentlig nøgle"
 
-#: config/prefs.php.dist:757
+#: config/prefs.php.dist:975
 msgid "Not at all"
 msgstr "Slet ikke"
 
-#: lib/Maintenance/Task/fetchmail_login.php:71
+#: lib/Maintenance/Task/fetchmail_login.php:70
 msgid "Note that this can take some time"
 msgstr "Bemærk at dette kan tage sin tid"
 
-#: config/prefs.php.dist:667
+#: lib/IMP.php:542
+msgid "Notepads"
+msgstr "Notesblokke"
+
+#: config/hooks.php.dist:503
+msgid "Notes"
+msgstr "Noter"
+
+#: config/prefs.php.dist:855
 msgid "Nothing"
 msgstr "Ingenting"
 
-#: attachment.php:89
+#: attachment.php:109
 msgid "Notification: Linked attachment downloaded"
 msgstr "Notits: Henvist vedhæftelse nedtaget"
 
-#: config/prefs.php.dist:409
+#: config/prefs.php.dist:439
 msgid "Number of months to keep old linked attachments if deleting monthly."
 msgstr ""
 "Antal måneder refererede vedhæftelser skal gemmes, når der slettes månedligt."
 
-#: config/prefs.php.dist:363
+#: config/prefs.php.dist:393
 msgid "Number of old sent-mail folders to keep if deleting monthly."
 msgstr ""
 "Antal af gamle mapper for sendt e-mail, der skal beholdes, når der slettes "
 "månedlig."
 
-#: templates/contacts/contacts.html:73
+#: templates/contacts/contacts.html:68
 msgid "OK"
 msgstr "OK"
 
-#: templates/smime/import_key.html:31 templates/search/search.html:64
+#: templates/smime/import_key.html:31 templates/search/search.html:61
 #: templates/pgp/import_key.html:30
 msgid "OR"
 msgstr "ELLER"
 
-#: search.php:334
-msgid "Old messages"
-msgstr "Gamle beskeder"
-
-#: lib/Maintenance/Task/delete_sentmail_monthly.php:52
+#: lib/Maintenance/Task/delete_sentmail_monthly.php:51
 msgid "Old sent-mail folders being purged."
 msgstr "Gamle mapper med afsendt e-mail bliver fjernet."
 
-#: lib/Block/summary.php:33
+#: lib/Block/summary.php:27
 msgid "Only display folders with unread messages in them?"
 msgstr "Vis kun mapper med ulæste besked?"
 
-#: templates/javascript/folders.js:12 templates/javascript/src/folders.js:79
+#: templates/javascript_defs.php:53
 msgid "Only one folder should be selected for this action."
 msgstr "Vælg venligst kun en mappe for denne handling."
 
-#: lib/IMP.php:883 lib/IMP.php:888
+#: lib/IMP.php:927 lib/IMP.php:932
 msgid "Open Fo_lder"
 msgstr "Åben mappe"
 
-#: lib/IMAP/Tree.php:437
+#: lib/IMP.php:932
+msgid "Open Folder"
+msgstr "Åben mappe"
+
+#: lib/IMAP/Tree.php:2034
 msgid "Opened Folder"
 msgstr "Åbnet mappe"
 
-#: lib/MIME/Viewer/itip.php:707 lib/MIME/Viewer/itip.php:830
+#: lib/MIME/Viewer/itip.php:827 lib/MIME/Viewer/itip.php:959
 msgid "Optional Participant"
 msgstr "Valgfri deltager"
 
-#: fetchmail.php:78 templates/fetchmail/fetchmail.html:6
+#: config/prefs.php.dist:639
+msgid "Ordered List"
+msgstr "Ordnet liste"
+
+#: templates/fetchmail/fetchmailprefs.html:3
 msgid "Other Mail Accounts"
 msgstr "Andre mail-konti"
 
-#: config/prefs.php.dist:114 config/prefs.php.dist:123
-#: config/prefs.php.dist:130 config/prefs.php.dist:137
-#: config/prefs.php.dist:145 config/prefs.php.dist:154
+#: config/prefs.php.dist:147 config/prefs.php.dist:160
+#: config/prefs.php.dist:167 config/prefs.php.dist:175
+#: config/prefs.php.dist:184
 msgid "Other Options"
 msgstr "Andre indstillinger"
 
-#: templates/login/login.html:101
+#: lib/IMAP/Tree.php:72
+msgid "Other Users' Folders"
+msgstr "Andre brugeres mapper"
+
+#: lib/api.php:178 templates/login/login.html:103
 msgid "Outbound Server"
 msgstr "Udgående server"
 
-#: pgp.php:41 lib/MIME/Viewer/pgp.php:164 lib/MIME/Viewer/pgp.php:212
-#: lib/MIME/Viewer/pgp.php:293
+#: pgp.php:44 lib/MIME/Viewer/pgp.php:165 lib/MIME/Viewer/pgp.php:213
+#: lib/MIME/Viewer/pgp.php:314
 msgid "PGP"
 msgstr "PGP"
 
-#: lib/IMP.php:1344
+#: lib/IMP.php:1450
 msgid "PGP Encrypt Message"
 msgstr "PGP-kryptér besked"
 
-#: lib/Compose.php:1135
+#: lib/IMP.php:1455
+msgid "PGP Encrypt Message with passphrase"
+msgstr "PGP-kryptér besked med løsen"
+
+#: lib/Compose.php:1406
 msgid "PGP Error: "
 msgstr "PGP-fejl: "
 
-#: lib/Compose.php:1114
-msgid "PGP Error: Need passphrase for personal private key."
-msgstr "PGP-fejl: Behøver løsen for egen, privat nøgle."
-
-#: config/prefs.php.dist:146
+#: config/prefs.php.dist:176
 msgid "PGP Options"
 msgstr "PGP-indstillinger"
 
-#: pgp.php:28
+#: pgp.php:30
 msgid "PGP Passphrase Input"
 msgstr "Indtastning af PGP-løsen"
 
-#: templates/pgp/pgp.html:62
+#: templates/pgp/pgp.html:69
 msgid "PGP Personal Keypair support requires a secure web connection."
 msgstr "Understøttelse af egne PGP-nøglesæt kræver sikker web-forbindelse."
 
-#: pgp.php:152
+#: pgp.php:159
 #, php-format
 msgid "PGP Public Key for \"%s (%s)\" was successfully added."
 msgstr "Offentlig PGP-nøgle for \"%s (%s)\" tilføjet."
 
-#: pgp.php:248
+#: pgp.php:262
 #, php-format
 msgid "PGP Public Key for \"%s\" was successfully deleted."
 msgstr "Offentlig PGP-nøgle for \"%s\" tilføjet."
 
-#: templates/pgp/pgp.html:20
+#: templates/pgp/pgp.html:29
 msgid "PGP Public Keyring"
 msgstr "Offentlig PGP-nøglering"
 
-#: lib/IMP.php:1345
+#: lib/IMP.php:1451
 msgid "PGP Sign Message"
 msgstr "PGP-signér besked"
 
-#: lib/IMP.php:1346
+#: lib/IMP.php:1452
 msgid "PGP Sign/Encrypt Message"
 msgstr "PGP-signér/kryptér besked"
 
-#: pgp.php:205
+#: lib/IMP.php:1456
+msgid "PGP Sign/Encrypt Message with passphrase"
+msgstr "PGP-signér/kryptér besked med løsen"
+
+#: compose.php:732
+msgid ""
+"PGP encryption cannot be used by default as public keys cannot be found for "
+"all recipients."
+msgstr ""
+
+#: pgp.php:210
 msgid "PGP private key successfully added."
 msgstr "Private PGP-nøgle tilføjet."
 
-#: pgp.php:180
+#: pgp.php:185
 msgid "PGP public key successfully added."
 msgstr "Offentlig PGP-nøgle tilføjet."
 
@@ -2680,139 +3057,156 @@ msgstr ""
 "er sat til at forhindre popup-vinduer bliver du nødt til at ændre opsætning "
 "for at PGP-faciliteterne kan virker korrekt."
 
-#: lib/IMAP.php:170
+#: lib/Compose.php:1366
+msgid "PGP: Need passphrase for personal private key."
+msgstr "PGP: Behøver løsen for egen, privat nøgle."
+
+#: lib/Compose.php:1375
+msgid "PGP: Need passphrase to encrypt your message with."
+msgstr "PGP: Behøver løsen til at kryptere beskeden med."
+
+#: lib/IMAP.php:279
 msgid "POP3"
 msgstr "POP3"
 
-#: lib/Fetchmail/imap.php:102
+#: lib/Fetchmail/imap.php:92
 msgid "POP3 (Auto Detect Protocols)"
-msgstr "POP3 (bestemt protokoller automatisk)"
+msgstr "POP3 (bestem protokoller automatisk)"
+
+#: lib/IMAP.php:285
+msgid "POP3 (self-signed certificate)"
+msgstr "POP3 (selv-signeret certifikat)"
 
-#: lib/IMAP.php:182
+#: lib/IMAP.php:297
 msgid "POP3 over SSL"
 msgstr "POP3 over SSL"
 
-#: lib/IMAP.php:188
+#: lib/IMAP.php:303
 msgid "POP3 over SSL (self-signed certificate)"
 msgstr "POP3 over SSL (selv-signeret certifikat)"
 
-#: lib/IMAP.php:176
+#: lib/IMAP.php:291
 msgid "POP3, no TLS"
 msgstr "POP3, ingen TLS"
 
-#: mailbox.php:374
+#: mailbox.php:440
 #, php-format
 msgid "Page %d of %d"
 msgstr "Side %d af %d"
 
-#: config/prefs.php.dist:964
+#: config/prefs.php.dist:1187
 msgid "Page with the First Unseen Message"
 msgstr "Side med første ulæste besked"
 
-#: config/prefs.php.dist:965
+#: config/prefs.php.dist:1188
 msgid "Page with the Last Unseen Message"
 msgstr "Side med sidste ulæste besked"
 
-#: message.php:670
+#: templates/mailbox/navbar.html:67
+msgid "Page:"
+msgstr "Side:"
+
+#: message.php:687
 msgid "Part(s)"
 msgstr "Del(e)"
 
-#: templates/pgp/pgp.html:119
+#: templates/pgp/pgp.html:122
 msgid "Passphrase (Again):"
 msgstr "Løsen (igen):"
 
-#: pgp.php:313 smime.php:247
+#: pgp.php:347 smime.php:255
 msgid "Passphrase successfully unloaded."
 msgstr "Løsen fjernet."
 
-#: templates/smime/passphrase.html:21 templates/pgp/passphrase.html:21
-#: templates/pgp/pgp.html:114
+#: templates/smime/passphrase.html:21 templates/pgp/passphrase.html:19
+#: templates/pgp/pgp.html:117
 msgid "Passphrase:"
 msgstr "Løsen:"
 
-#: pgp.php:115
+#: pgp.php:122
 msgid "Passphrases cannot be empty"
 msgstr "Løsener kan ikke være tomme"
 
-#: pgp.php:117
+#: pgp.php:124
 msgid "Passphrases do not match"
 msgstr "Løsenerne skal være ens"
 
-#: templates/login/login.html:90
+#: lib/api.php:191 templates/login/login.html:92
 msgid "Password"
 msgstr "Kodeord"
 
 #: templates/smime/import_key.html:54
+#: templates/fetchmail/fetchmailprefs.html:59
 msgid "Password:"
 msgstr "Kodeord:"
 
-#: fetchmailprefs.php:169
-msgid "Perform maintenance operations on login?"
-msgstr "Udfør vedligeholdelse ved log ind?"
+#: templates/login/mobile.inc:17
+msgid "Password: "
+msgstr "Kodeord: "
 
-#: acl.php:76 acl.php:102
-msgid "Permissions for this user cannot be changed."
-msgstr "Tilladelserne for denne bruger kan ikke ændres."
+#: config/prefs.php.dist:653
+msgid "Paste from clipboard"
+msgstr "Indsæt fra klippebord"
 
-#: mailbox.php:815 mailbox.php:984 message.php:457
-#: templates/mailbox/legend.html:8 templates/mailbox/navbar.html:21
+#: mailbox.php:752 message.php:465 templates/mailbox/navbar.html:24
 msgid "Personal"
 msgstr "Personlig"
 
-#: config/prefs.php.dist:14
+#: config/prefs.php.dist:15
 msgid "Personal Information"
 msgstr "Profiler"
 
-#: pgp.php:123
+#: pgp.php:130
 msgid "Personal PGP keypair generated successfully."
 msgstr "Egen PGP-nøglepar genereret med succes."
 
-#: pgp.php:130
+#: pgp.php:137
 msgid "Personal PGP keys deleted successfully."
 msgstr "Egne PGP-nøgler slettet."
 
-#: smime.php:219
+#: smime.php:227
 msgid "Personal S/MIME certificates NOT imported: "
 msgstr "Egne S/MIME-certifikater IKKE importeret: "
 
-#: smime.php:144
+#: smime.php:152
 msgid "Personal S/MIME keys deleted successfully."
 msgstr "Egne S/MIME-nøgler slettet."
 
-#: config/prefs.php.dist:226
+#: config/prefs.php.dist:247
 msgid "Place your signature before replies and forwards?"
 msgstr "Sæt din signatur foran svar og videresendelser?"
 
-#: lib/Compose.php:353
+#: lib/Compose.php:474
 msgid "Plaintext Version of Message"
 msgstr "Rentekst-udgave af besked"
 
-#: config/prefs.php.dist:861
+#: templates/prefs/soundselect.inc:3
 msgid ""
-"Play sound on new mail?  This requires your browser to support embedded "
-"sound files.  Almost all do on Windows and Mac, but other platforms will "
+"Play a sound on new mail?  This requires your browser to support embedded "
+"sound files.  Almost all do on Windows and Mac, but other platforms may "
 "require a plugin."
 msgstr ""
 "Afspil lyd ved ny besked? Dette kræver, at din browser understøtter "
 "indlejrede lyd-filer.  Omtrent alle gør under Windows og Mac, men andre "
-"platforme kræver et plugin."
+"platforme kræver muligvis et plugin."
 
-#: templates/javascript/mailbox.js:34 templates/javascript/message.js:14
-#: templates/javascript/src/mailbox.js:202
-#: templates/javascript/src/message.js:77
+#: templates/javascript_defs.php:76
 msgid "Please enter a name for the new folder:"
 msgstr "Indtast venligst et navn til den nye mappe:"
 
-#: templates/javascript/folders.js:17 templates/javascript/src/folders.js:102
-#: templates/javascript/src/folders.js:104
+#: templates/javascript_defs.php:55 templates/javascript_defs.php:56
 msgid "Please enter the name of the new folder:"
 msgstr "Indtast venligst navnet til den nye mappe:"
 
-#: templates/javascript/folders.js:24 templates/javascript/src/folders.js:137
+#: templates/javascript_defs.php:60
 msgid "Please enter the new name:"
 msgstr "Angiv venligst det nye navn:"
 
-#: templates/pgp/passphrase.html:15
+#: templates/pgp/passphrase.html:12
+msgid "Please enter the passphrase for this message."
+msgstr "Du skal angive løsenet for denne besked"
+
+#: templates/pgp/passphrase.html:14
 msgid ""
 "Please enter the passphrase for your PGP private key. You will only need to "
 "enter this passphrase once per session."
@@ -2828,7 +3222,7 @@ msgstr ""
 "Indtast et løsen til din private S/MIME-nøgle.  Du vil kun skulle indtaste "
 "dette løsen én gang pr. session."
 
-#: login.php:180
+#: login.php:192
 msgid ""
 "Please log in again to resume composing your message. If you are NOT using "
 "cookies AND you are composing messages in popup windows, you will have to "
@@ -2840,63 +3234,83 @@ msgstr ""
 "Dette er nødvendigt for at forhindre angribere i at kabre dit session-ID. Vi "
 "beklager påførte ulemper."
 
-#: templates/javascript/login.js:4 templates/javascript/src/login.js:42
+#: templates/javascript_defs.php:71
 msgid "Please provide your password."
 msgstr "Indtast venligst dit kodeord."
 
-#: templates/javascript/login.js:4 templates/javascript/src/login.js:38
+#: templates/javascript_defs.php:70
 msgid "Please provide your username."
 msgstr "Indtast venligst dit brugernavn."
 
-#: compose.php:106 lib/Compose.php:2393
+#: lib/Compose.php:2790 lib/UI/Compose.php:26
 msgid "Please resolve ambiguous or invalid addresses."
 msgstr "Ret venligst tvetydige eller ugyldige adresser."
 
-#: templates/javascript/folders.js:12 templates/javascript/src/folders.js:60
+#: templates/javascript_defs.php:52
 msgid "Please select a folder before you perform this action."
 msgstr "Du skal vælge en mappe, før du kan udføre denne handling."
 
-#: templates/javascript/search.js:10 templates/javascript/src/search.js:48
+#: templates/javascript_defs.php:64
 msgid "Please select at least one folder to search."
 msgstr "Vælg mindst en mappe, som du vil søge i."
 
-#: templates/javascript/folders.js:16 templates/javascript/src/folders.js:96
-msgid "Please select only one folder for this operation."
-msgstr "Vælg venligst kun én mappe for denne handling."
-
-#: templates/compose/redirect.html:39
+#: templates/compose/redirect.html:40
 msgid "Please select or edit in the box to the right:"
 msgstr "Vælg venligst eller rediger i boksen til højre:"
 
+#: config/prefs.php.dist:1301
+msgid "Poll all folders for new mail?"
+msgstr "Check alle mapper for ny post?"
+
+#: lib/api.php:169 templates/login/login.html:67
+msgid "Port"
+msgstr "Port"
+
+#: lib/IMAP/ACL/rfc2086.php:54 lib/IMAP/ACL/rfc4314.php:54
+msgid "Post"
+msgstr "Send"
+
 #: config/motd.php.dist:41
 msgid "Powered by Horde"
 msgstr "Powered by Horde"
 
-#: config/prefs.php.dist:218
+#: config/prefs.php.dist:239
 msgid "Precede your signature with dashes ('-- ')?"
 msgstr "Sæt bindestreger ('-- ') foran din signatur?"
 
-#: filterprefs.php:40 pgp.php:256 smime.php:253
+#: config/hooks.php.dist:519
+msgid "Preferences"
+msgstr "Indstillinger"
+
+#: filterprefs.php:53 pgp.php:271 smime.php:262
 msgid "Preferences successfully updated."
-msgstr "Præferencerne opdateret."
+msgstr "Indstillinger opdateret."
 
-#: compose.php:1344 templates/compose/compose.html:316
+#: compose.php:1212
 msgid "Preview"
 msgstr "Glimt"
 
-#: message.php:517 message.php:703
+#: message.php:528
 msgid "Previous Message"
 msgstr "Forrige besked"
 
-#: mailbox.php:434
+#: mailbox.php:280
 msgid "Previous Page"
 msgstr "Forrige side"
 
-#: message.php:598
+#: message.php:603
 msgid "Print"
 msgstr "Udskriv"
 
-#: message.php:659 lib/MIME/Viewer/itip.php:789
+#: config/prefs.php.dist:650
+msgid "Print document"
+msgstr "Udskriv dokument"
+
+#: message.php:691
+msgid "Printed By"
+msgstr "Udskrevet af"
+
+#: message.php:671 lib/MIME/Viewer/itip.php:918
 msgid "Priority"
 msgstr "Prioritet"
 
@@ -2904,378 +3318,404 @@ msgstr "Prioritet"
 msgid "Private Key Password:"
 msgstr "Kodeord til privat nøgle:"
 
-#: config/prefs.php.dist:622
+#: config/prefs.php.dist:717
 msgid "Prompt every time an attachment is sent; default to NO"
 msgstr "Spørg hver gang en vedhæftelse sendes; normalen er NEJ"
 
-#: config/prefs.php.dist:621
+#: config/prefs.php.dist:716
 msgid "Prompt every time an attachment is sent; default to YES"
 msgstr "Spørg hver gang en vedhæftelse sendes; normalen er JA"
 
-#: lib/Crypt/PGP.php:430
+#: config/prefs.php.dist:983
+msgid "Prompt to send read receipt when requested by the sender?"
+msgstr "Spørg om der skal sendes læst-kvittering når anmodet af afsender?"
+
+#: lib/api.php:173 templates/login/login.html:72
+msgid "Protocol"
+msgstr "Protokol"
+
+#: login.php:290 templates/fetchmail/fetchmailprefs.html:47
+msgid "Protocol:"
+msgstr "Protokol:"
+
+#: lib/Crypt/PGP.php:491
 msgid "Public PGP keyserver support has been disabled."
 msgstr "Understøttelse af offentlig PGP-nøgleserver er slået fra."
 
-#: mailbox.php:388 mailbox.php:483
+#: mailbox.php:454 mailbox.php:522
 msgid "Pur_ge Deleted"
 msgstr "Fjern slettede"
 
-#: templates/folders/actions.html:15
+#: lib/IMAP/ACL/rfc4314.php:58 templates/folders/actions.html:22
 msgid "Purge"
 msgstr "Tøm"
 
-#: mailbox.php:388 mailbox.php:483
+#: mailbox.php:454 mailbox.php:522
 msgid "Purge Deleted"
 msgstr "Fjern slettede"
 
-#: config/prefs.php.dist:428
+#: config/prefs.php.dist:458
+msgid "Purge Spam how often:"
+msgstr "Tøm spam-mappen hvor tit:"
+
+#: config/prefs.php.dist:486
 msgid "Purge Trash how often:"
 msgstr "Tøm skraldespanden hvor tit:"
 
-#: config/prefs.php.dist:437
+#: config/prefs.php.dist:467
+msgid "Purge messages in Spam folder older than this amount of days."
+msgstr "Fjern beskeder i spam-mappen, der er ældre end dette antal dage."
+
+#: config/prefs.php.dist:495
 msgid "Purge messages in Trash folder older than this amount of days."
 msgstr "Fjern beskeder i skraldespanden, der er ældre end dette antal dage."
 
-#: config/prefs.php.dist:391
+#: config/prefs.php.dist:421
 msgid "Purge messages in sent-mail folder(s) older than this amount of days."
 msgstr ""
 "Fjern beskeder i sendt e-post-mappe(r), der er ældre end dette antal dage."
 
-#: config/prefs.php.dist:418
+#: config/prefs.php.dist:448
+msgid "Purge old messages in the Spam folder?"
+msgstr "Fjern gamle beskeder i spam-mappen?"
+
+#: config/prefs.php.dist:476
 msgid "Purge old messages in the Trash folder?"
 msgstr "Fjern gamle beskeder i skraldespanden?"
 
-#: config/prefs.php.dist:372
+#: config/prefs.php.dist:402
 msgid "Purge old messages in the sent-mail folder(s)?"
 msgstr "Fjern gamle beskeder i sendt e-post-mappe(r)?"
 
-#: config/prefs.php.dist:382
+#: config/prefs.php.dist:412
 msgid "Purge sent-mail how often:"
 msgstr "Tøm sendt e-post hvor tit:"
 
-#: lib/Maintenance/Task/purge_trash.php:65
+#: lib/Maintenance/Task/purge_spam.php:64
+#, php-format
+msgid "Purging %d messages from Spam folder."
+msgstr "Fjerner %d beskeder fra spam-mappen."
+
+#: lib/Maintenance/Task/purge_trash.php:63
 #, php-format
 msgid "Purging %d messages from Trash folder."
 msgstr "Fjerner %d beskedr fra skraldespand."
 
-#: lib/Maintenance/Task/purge_sentmail.php:65
+#: lib/Maintenance/Task/purge_sentmail.php:63
 #, php-format
 msgid "Purging %d messages from sent-mail folder."
 msgstr "Fjerner %d beskedr fra sendt e-post-mappe."
 
-#: lib/Maintenance/Task/purge_trash.php:63
+#: lib/Maintenance/Task/purge_spam.php:62
+msgid "Purging 1 message from Spam folder."
+msgstr "Fjerner 1 besked fra spam-mappen."
+
+#: lib/Maintenance/Task/purge_trash.php:61
 msgid "Purging 1 message from Trash folder."
 msgstr "Fjerner 1 besked fra skraldespand."
 
-#: lib/Maintenance/Task/purge_sentmail.php:63
+#: lib/Maintenance/Task/purge_sentmail.php:61
 #, php-format
 msgid "Purging 1 message from sent-mail folder %s."
 msgstr "Fjerner 1 besked fra sendt e-post-mappe %s."
 
-#: lib/IMP.php:945
+#: lib/Quota.php:64
 #, php-format
-msgid "Quota status: %.2fMB / %.2fMB  (%.2f%%)"
+msgid "Quota status: %.2f MB / %.2f MB  (%.2f%%)"
 msgstr "Kvotestatus: %.2fMB / %.2fMB  (%.2f%%)"
 
-#: lib/IMP.php:949
+#: lib/Quota.php:70
 #, php-format
-msgid "Quota status: %.2fMB / NO LIMIT"
+msgid "Quota status: %.2f MB / NO LIMIT"
 msgstr "Kvotestatus: %.2fMB / INTET LOFT"
 
-#: lib/IMP.php:952
+#: lib/IMP.php:1046
 #, php-format
 msgid "Quota status: NO LIMIT"
 msgstr "Kvotestatus: INTET LOFT"
 
-#: config/prefs.php.dist:552
+#: config/prefs.php.dist:788
 #, php-format
 msgid "Quoting %f:"
 msgstr "Citat af %f:"
 
-#: templates/folders/actions.html:32
+#: lib/IMAP/ACL/rfc2086.php:50 lib/IMAP/ACL/rfc4314.php:50
+msgid "Read"
+msgstr "Læs"
+
+#: templates/folders/actions.html:40
 msgid "Rebuild Folder Tree"
 msgstr "Gendan Mappetræ"
 
-#: lib/Search.php:634
-msgid "Received On"
-msgstr "Modtaget den"
-
-#: lib/Search.php:642
-msgid "Received Since"
-msgstr "Modtaget siden"
-
-#: lib/Search.php:638
-msgid "Received Until"
-msgstr "Modtaget før"
-
-#: templates/search/search.html:35
+#: templates/search/search.html:31
 msgid "Recent Searches"
 msgstr "Nylige søgninger"
 
-#: templates/search/search.html:40
+#: templates/search/search.html:35 templates/search/search.html:37
 msgid "Recent Searches:"
 msgstr "Nylige søgninger:"
 
-#: message.php:560
+#: message.php:573 message.php:617
 msgid "Redirec_t"
 msgstr "Omadresser"
 
-#: message.php:560
+#: message.php:573 message.php:617
 msgid "Redirect"
 msgstr "Omadresser"
 
-#: templates/compose/redirect.html:77
+#: templates/compose/redirect.html:83
 msgid "Redirect Message"
 msgstr "Omadresser besked"
 
-#: compose.php:448
+#: compose.php:376
 msgid "Redirect this message"
 msgstr "Omadresser denne besked"
 
-#: compose.php:517
-msgid "Redirecting failed."
-msgstr "Omadressering mislykkedes."
+#: config/prefs.php.dist:648
+msgid "Redoes your last action"
+msgstr "Gentager din sidste handling"
 
-#: folders.php:281
+#: folders.php:361
 msgid "Refresh"
 msgstr "Opdater"
 
-#: config/prefs.php.dist:846
+#: config/prefs.php.dist:1063
 msgid "Refresh Folder Views:"
 msgstr "Opdater visningerne af mapper:"
 
-#: mailbox.php:348
+#: mailbox.php:417
 msgid "Reload"
 msgstr "Genopfrisk"
 
-#: folders.php:271
+#: folders.php:351
 msgid "Reload View"
 msgstr "Opdater visning"
 
-#: lib/MIME/Viewer/itip.php:535 lib/MIME/Viewer/itip.php:554
+#: lib/MIME/Viewer/itip.php:624 lib/MIME/Viewer/itip.php:643
 msgid "Remember the free/busy information."
 msgstr "Husk ledig/optaget-informationen."
 
-#: config/prefs.php.dist:1040
+#: config/prefs.php.dist:1270
 msgid "Remember the last view"
 msgstr "Husk den sidste visning"
 
-#: lib/MIME/Viewer/html.php:98
-#, php-format
-msgid "Remote images are blocked to protect your privacy. %s"
-msgstr ""
-"Eksterne billeder er blokkeret for at beskytte din personlige identitet. %s"
+#: templates/fetchmail/fetchmailprefs.html:68
+msgid "Remote Mailbox:"
+msgstr "Fjern brevbakke"
 
-#: search.php:330
+#: search.php:287
 msgid "Remove Field From Search"
 msgstr "Fjern felt fra søgning"
 
-#: templates/prefs/sourceselect.inc:305
+#: config/prefs.php.dist:658
+msgid "Remove formatting"
+msgstr "Fjern formattering"
+
+#: templates/prefs/sourceselect.inc:302
 msgid "Remove source"
 msgstr "Fjern kilde"
 
-#: templates/folders/actions.html:11
+#: templates/folders/actions.html:18
 msgid "Rename"
 msgstr "Omdøb"
 
-#: config/prefs.php.dist:345
+#: config/prefs.php.dist:375
 msgid "Rename sent-mail folder at beginning of month?"
 msgstr "Omdøb mappe for sendte beskeder i starten af måneden?"
 
-#: lib/Folder.php:430
+#: lib/Folder.php:380
 #, php-format
 msgid "Renaming \"%s\" to \"%s\" failed. This is what the server said"
 msgstr ""
 "Omdøbning af \"%s\" til \"%s\" mislykkedes. Følgende besked kom fra serveren"
 
-#: message.php:547
-msgid "Repl_y to List"
-msgstr "Svar til liste"
-
-#: templates/compose/spelling.html:50
-msgid "Replace with:"
-msgstr "Erstat med:"
-
-#: message.php:544
+#: message.php:557
 msgid "Reply"
 msgstr "Svar"
 
-#: lib/MIME/Viewer/itip.php:315 lib/MIME/Viewer/itip.php:413
+#: lib/MIME/Viewer/itip.php:342 lib/MIME/Viewer/itip.php:448
 msgid "Reply Sent."
 msgstr "Svar sendt."
 
-#: message.php:553
-msgid "Reply to All"
-msgstr "Svar til alle"
-
-#: compose.php:421
+#: compose.php:345
 msgid "Reply to All:"
 msgstr "Svar til alle:"
 
-#: message.php:547
-msgid "Reply to List"
-msgstr "Svar til liste"
-
-#: compose.php:423
+#: compose.php:347
 msgid "Reply to List:"
 msgstr "Svar til liste:"
 
-#: message.php:553
-msgid "Reply to _All"
-msgstr "Svar til alle"
-
-#: lib/MIME/Viewer/itip.php:537 lib/MIME/Viewer/itip.php:546
-#: lib/MIME/Viewer/itip.php:556
+#: lib/MIME/Viewer/itip.php:626 lib/MIME/Viewer/itip.php:635
+#: lib/MIME/Viewer/itip.php:645
 msgid "Reply with Not Supported Message"
 msgstr "Svar med ikke-understøttet-besked"
 
-#: lib/MIME/Viewer/itip.php:544
+#: lib/MIME/Viewer/itip.php:633
 msgid "Reply with free/busy for next 2 months."
 msgstr "Svar med ledig/optaget for næste 2 måneder."
 
-#: lib/MIME/Viewer/itip.php:543
+#: lib/MIME/Viewer/itip.php:632
 msgid "Reply with requested free/busy information."
 msgstr "Svar med anmodet ledig/optaget-information."
 
-#: message.php:232
+#: lib/UI/Message.php:29
 msgid "Reply-To"
 msgstr "Reply-To"
 
-#: lib/Compose.php:1543
+#: lib/Compose.php:1971
 msgid "Reply-To: "
 msgstr "Reply-To: "
 
-#: compose.php:419
+#: compose.php:343
 msgid "Reply:"
 msgstr "Reply:"
 
-#: mailbox.php:514 message.php:611
+#: mailbox.php:544 message.php:614
 msgid "Report as Innocent"
 msgstr "Anmeld som ej-spam"
 
-#: mailbox.php:506 message.php:603
+#: mailbox.php:538 message.php:608
 msgid "Report as Spam"
 msgstr "Anmeld som SPAM"
 
-#: compose.php:1267
+#: compose.php:1133
 msgid "Request a _Read Receipt"
 msgstr "Anmod om kvittering for læsning"
 
-#: config/prefs.php.dist:636
+#: config/prefs.php.dist:731
 msgid "Request read receipts?"
 msgstr "Anmod om kvittering for læsning"
 
-#: mailbox.php:131
+#: mailbox.php:115
 msgid "Requested message not found."
 msgstr "Forespurgte besked ikke fundet."
 
-#: lib/MIME/Viewer/itip.php:699 lib/MIME/Viewer/itip.php:822
+#: lib/MIME/Viewer/itip.php:819 lib/MIME/Viewer/itip.php:951
 msgid "Required Participant"
 msgstr "Krævet deltager"
 
-#: templates/search/search.html:30 templates/search/search.html:199
-#: templates/acl/acl.html:90
+#: templates/search/search.html:26 templates/search/search.html:183
+#: templates/acl/acl.html:80
 msgid "Reset"
 msgstr "Nulstil"
 
-#: lib/MIME/Viewer/itip.php:119
+#: lib/MIME/Viewer/itip.php:117
 msgid "Respondent Status Updated."
 msgstr "Respondent-status opdateret."
 
-#: message.php:591
+#: message.php:596
 msgid "Resume"
 msgstr "Fortsæt"
 
-#: login.php:181
+#: lib/UI/Compose.php:154
+msgid "Resume Editing"
+msgstr "Fortsæt rettelser"
+
+#: login.php:193
 msgid "Resume your session"
 msgstr "Fortsæt din session"
 
-#: templates/stationery/prefs.inc:44
-msgid "Return to \"Message Composition\""
+#: templates/fetchmail/fetchmailprefs.html:125
+msgid "Return to Fetch Mail"
+msgstr "Vend tilbage til Hentning af post"
+
+#: templates/folders/folders_size.html:30
+msgid "Return to Folders"
+msgstr "Vend tilbage til mappelisten"
+
+#: stationery.php:143
+msgid "Return to Message Composition"
 msgstr "Tilbage til \"Skrivning af ny besked\""
 
-#: filterprefs.php:52 templates/smime/smime.html:96 templates/pgp/pgp.html:149
-#: templates/acl/acl.html:91 templates/acl/acl.html:103
+#: filterprefs.php:66 templates/smime/smime.html:13
+#: templates/smime/smime.html:93 templates/pgp/pgp.html:21
+#: templates/pgp/pgp.html:145 templates/acl/acl.html:35
+#: templates/acl/acl.html:81 templates/acl/acl.html:95
 msgid "Return to Options"
 msgstr "Tilbage til indstillingerne"
 
-#: config/prefs.php.dist:780
+#: config/prefs.php.dist:998
 msgid ""
 "Return to the mailbox listing after deleting, moving, or copying a message?"
 msgstr ""
 "Vend tilbage til brevbakken efter sletning, flytning eller kopiering af "
 "besked?"
 
-#: lib/MIME/Viewer/itip.php:690 lib/MIME/Viewer/itip.php:813
+#: acl.php:114
+#, php-format
+msgid "Rights for user \"%s\" cannot be modified."
+msgstr "Rettigheder for brugeren \"%s\" kan ikke ændres."
+
+#: lib/MIME/Viewer/itip.php:810 lib/MIME/Viewer/itip.php:942
 msgid "Role"
 msgstr "Regel"
 
-#: smime.php:65 lib/MIME/Viewer/pkcs7.php:142 lib/MIME/Viewer/pkcs7.php:237
-#: lib/MIME/Viewer/pkcs7.php:425
+#: smime.php:67 lib/MIME/Viewer/pkcs7.php:173 lib/MIME/Viewer/pkcs7.php:296
+#: lib/MIME/Viewer/pkcs7.php:488
 msgid "S/MIME"
 msgstr "S/MIME"
 
-#: lib/IMP.php:1349
+#: lib/IMP.php:1460
 msgid "S/MIME Encrypt Message"
 msgstr "S/MIME-krypteret besked"
 
-#: lib/Compose.php:1167
+#: lib/Compose.php:1438
 msgid "S/MIME Error: "
 msgstr "S/MIME-fejl: "
 
-#: lib/Compose.php:1146
+#: lib/Compose.php:1417
 msgid "S/MIME Error: Need passphrase for personal private key."
 msgstr "S/MIME-fejl: Løsen til egen, privat nøgle nødvendig."
 
-#: config/prefs.php.dist:155
+#: config/prefs.php.dist:185
 msgid "S/MIME Options"
 msgstr "S/MIME-indstillinger"
 
-#: smime.php:52
+#: smime.php:54
 msgid "S/MIME Passphrase Input"
 msgstr "Indtast S/MIME-løsen"
 
-#: templates/smime/smime.html:55
+#: templates/smime/smime.html:61
 msgid "S/MIME Personal Keypair support requires a secure web connection."
 msgstr "Understøttelse af egen S/MIME nøglepar kræver sikker web-forbindelse."
 
-#: smime.php:152
+#: smime.php:160
 #, php-format
 msgid "S/MIME Public Key for \"%s\" was successfully deleted."
 msgstr "Offentlig S/MIME-nøgle for \"%s\" slettet."
 
-#: smime.php:174
+#: smime.php:182
 msgid "S/MIME Public Key successfully added."
 msgstr "Offentlig S/MIME nøgle tilføjet."
 
-#: templates/smime/smime.html:11
+#: templates/smime/smime.html:21
 msgid "S/MIME Public Keyring"
 msgstr "Offentlig S/MIME nøglering"
 
-#: smime.php:223
+#: smime.php:231
 msgid "S/MIME Public/Private Keypair successfully added."
 msgstr "Offentlig/privat S/MIME nøglepar tilføjet."
 
-#: lib/IMP.php:1350
+#: lib/IMP.php:1461
 msgid "S/MIME Sign Message"
 msgstr "S/MIME-signér besked"
 
-#: lib/IMP.php:1351
+#: lib/IMP.php:1462
 msgid "S/MIME Sign/Encrypt Message"
 msgstr "S/MIME signér/kryptér besked"
 
-#: templates/smime/smime.html:85
+#: templates/smime/smime.html:86
 msgid "S/MIME support is disabled on this system."
 msgstr "Understøttelse af S/MIME slået fra på dette system."
 
-#: lib/MIME/Viewer/pkcs7.php:241
+#: lib/MIME/Viewer/pkcs7.php:300
 msgid ""
 "S/MIME support is not currently enabled so the message is unable to be "
 "decrypted."
 msgstr ""
 "Understøttelse af S/MIME er ikke aktiveret, så beskeden kan ikke dekrypteres."
 
-#: lib/MIME/Viewer/pkcs7.php:173
+#: lib/MIME/Viewer/pkcs7.php:204
 msgid ""
 "S/MIME support is not enabled so the contents of this signed message cannot "
 "be displayed."
@@ -3283,7 +3723,7 @@ msgstr ""
 "Understøttelse af S/MIME er ikke aktiveret, så indholdet af denne signerede "
 "besked kan ikke vises."
 
-#: lib/MIME/Viewer/pkcs7.php:146
+#: lib/MIME/Viewer/pkcs7.php:177
 msgid ""
 "S/MIME support is not enabled so the digital signature is unable to be "
 "verified."
@@ -3291,6 +3731,10 @@ msgstr ""
 "Understøttelse af S/MIME er ikke aktiveret, så den digitale signatur kan "
 "ikke verificeres."
 
+#: lib/MIME/Viewer/pkcs7.php:134
+msgid "S/MIME support is not enabled."
+msgstr "S/MIME er slået fra på dette system."
+
 #: templates/smime/smime.html:4
 msgid ""
 "S/MIME support requires popup windows to be used.  If your browser is "
@@ -3301,151 +3745,185 @@ msgstr ""
 "browser er sat til at blokkere popup-vinduer, bliver du nødt til at ændre "
 "denne indstilling; ellers vil S/MIME-funktioner ikke virke korrekt."
 
-#: templates/login/login.html:105
+#: templates/login/login.html:108
 msgid "SMTP"
 msgstr "SMTP"
 
-#: compose.php:1176
+#: lib/api.php:181 templates/login/login.html:107
+msgid "SMTP Port"
+msgstr "SMTP port"
+
+#: compose.php:1017
 msgid "S_ubject"
 msgstr "Emne"
 
-#: compose.php:1246
+#: compose.php:1112
 msgid "Sa_ve a copy in "
 msgstr "Gem en kopi i "
 
-#: message.php:596
+#: message.php:600
 msgid "Sa_ve as"
 msgstr "Gem som"
 
-#: templates/search/search.html:29 templates/search/search.html:198
+#: templates/search/search.html:25 templates/search/search.html:182
+#: templates/fetchmail/fetchmailprefs.html:121 templates/acl/acl.html:79
 msgid "Save"
 msgstr "Gem"
 
-#: compose.php:1320
+#: compose.php:1188
 msgid "Save Attachments with message in sent-mail folder?"
 msgstr "Gem vedhæftelser med beskeder i \"Sendt post\"-mappen?"
 
-#: templates/compose/compose.html:23 templates/compose/compose.html:208
+#: templates/compose/compose.html:19 templates/compose/compose.html:206
 msgid "Save Draft"
 msgstr "Gem kladde"
 
-#: saveimage.php:51
+#: saveimage.php:53
 msgid "Save Image"
 msgstr "Gem billede"
 
-#: lib/MIME/Contents.php:241
+#: lib/MIME/Contents.php:262
 msgid "Save Image in Gallery"
 msgstr "Gem billede i galleri"
 
-#: filterprefs.php:113 templates/smime/smime.html:95
-#: templates/pgp/pgp.html:148
+#: filterprefs.php:129 templates/smime/smime.html:12
+#: templates/smime/smime.html:92 templates/pgp/pgp.html:20
+#: templates/pgp/pgp.html:144
 msgid "Save Options"
 msgstr "Gemme Indstillinger"
 
-#: templates/stationery/prefs.inc:40
+#: templates/stationery/stationery.html:42
 msgid "Save Stationery"
 msgstr "Gem brevpapir"
 
-#: compose.php:1091
+#: compose.php:930
 msgid "Save _Draft"
 msgstr "Gem kladde"
 
-#: message.php:596
+#: message.php:600 config/prefs.php.dist:655
 msgid "Save as"
 msgstr "Gem som"
 
-#: config/prefs.php.dist:573
+#: config/prefs.php.dist:814
 msgid "Save drafts as unseen?"
 msgstr "Gem kladder som ulæst?"
 
-#: config/prefs.php.dist:583
+#: config/prefs.php.dist:825
 msgid "Save drafts automatically while composing?"
 msgstr "Gem automatisk kladder under skrivning?"
 
-#: config/prefs.php.dist:1144
+#: lib/MIME/Viewer/pkcs7.php:257
+msgid "Save in your Address Book"
+msgstr "Gem i dit adressekartotek"
+
+#: config/prefs.php.dist:1369
 msgid "Save recipients automatically to the default address book?"
 msgstr "Gem modtagere automatisk i det normale adressekartotek?"
 
-#: templates/search/search.html:189
+#: templates/search/search.html:173
 msgid "Save search as a virtual folder?"
 msgstr "Gem søgning som en virtuel mappe?"
 
-#: config/prefs.php.dist:234
+#: config/prefs.php.dist:255
 msgid "Save sent mail?"
 msgstr "Gem sendt besked?"
 
-#: lib/Compose.php:151
+#: lib/Compose.php:247
 msgid "Saving the draft failed. Could not create a drafts folder."
 msgstr "Lagring af kladde fejlede.  Kan ikke oprette en mappe til kladder."
 
-#: lib/Compose.php:90
+#: lib/Compose.php:187
 msgid "Saving the draft failed. No draft folder specified."
-msgstr "Lagring af kladde mislykkedes. Kladde-mappe ikke specificeret."
+msgstr "Lagring af kladde mislykkedes. Kladde-mappen er ikke specificeret."
 
-#: lib/Compose.php:166
+#: lib/Compose.php:218
+#, php-format
+msgid ""
+"Saving the draft failed. The %s header contains an invalid e-mail address: %"
+"s."
+msgstr ""
+"Lagring af kladde mislykkedes. %s headeren indeholder en ugyldig adresse: %s."
+
+#: lib/Compose.php:254
 #, php-format
 msgid "Saving the draft failed. This is what the server said: %s"
 msgstr "Lagring af kladde mislykkedes. Følgende besked kom fra serveren: %s"
 
-#: mailbox.php:356 lib/Search.php:501 lib/Block/tree_folders.php:39
-#: templates/contacts/contacts.html:25
+#: mailbox.php:423 search.php:147 lib/Search.php:574
+#: lib/Block/tree_folders.php:43 templates/contacts/contacts.html:25
 msgid "Search"
 msgstr "Søg"
 
-#: mailbox.php:356 search.php:215
+#: mailbox.php:423 search.php:151
 #, php-format
 msgid "Search %s"
-msgstr "Søg efter %s"
+msgstr "Søg i %s"
 
-#: templates/search/search.html:49
+#: templates/search/search.html:46
 msgid "Search Criteria"
 msgstr "Søge-kriterier"
 
-#: templates/search/search.html:128
-msgid "Search Flags"
-msgstr "Søge-flag"
-
-#: templates/search/search.html:153
+#: templates/search/search.html:137
 msgid "Search Folders"
 msgstr "Søge-mapper"
 
-#: config/prefs.php.dist:124
-msgid "Search Options"
-msgstr "Søge-indstillinger"
-
-#: search.php:160
+#: search.php:93 templates/contacts/contacts.html:31
 msgid "Search Results"
 msgstr "Resultat for søgning"
 
-#: templates/mailbox/navbar.html:11 templates/mailbox/navbar.html:26
+#: templates/search/search.html:84
+msgid "Search Text"
+msgstr "Søg tekst"
+
+#: templates/mailbox/navbar.html:14 templates/mailbox/navbar.html:30
 msgid "Seen"
 msgstr "Set"
 
-#: search.php:321
+#: lib/Search.php:787
+msgid "Seen messages"
+msgstr "Læste beskeder"
+
+#: templates/fetchmail/fetchmailprefs.html:123
+msgid "Select Another Account"
+msgstr "Vælg en anden konto"
+
+#: search.php:278
 msgid "Select a date"
 msgstr "Vælg en dato"
 
-#: templates/search/search.html:70
+#: templates/search/search.html:65 templates/search/search.html:68
 msgid "Select a field"
 msgstr "Vælg et felt"
 
-#: config/prefs.php.dist:139
+#: templates/fetchmail/fetchmail.html:11
+msgid "Select accounts to fetch mail from:"
+msgstr "Vælg konti, der skal hentes e-post fra:"
+
+#: config/prefs.php.dist:169
 msgid "Select address book sources for adding and searching for addresses."
 msgstr "Vælg adressekartoteker for oprettelse og søgning af adresser."
 
-#: templates/search/search.html:157
+#: config/prefs.php.dist:649 templates/search/search.html:141
 msgid "Select all"
 msgstr "Vælg alle"
 
-#: templates/prefs/sourceselect.inc:323
+#: templates/prefs/sourceselect.inc:321
 msgid "Select all fields to search when expanding addresses."
 msgstr "Vælg alle felter som skal gennemsøges, når adresser ekspanderes."
 
-#: templates/search/search.html:158
+#: templates/fetchmail/fetchmailprefs.html:21
+msgid "Select an account:"
+msgstr "Vælg en konto:"
+
+#: templates/folders/folders.html:3
+msgid "Select mailbox"
+msgstr "Vælg mailbox"
+
+#: templates/search/search.html:142
 msgid "Select none"
 msgstr "Vælg ingen"
 
-#: templates/compose/compose.html:135
+#: templates/compose/compose.html:134
 msgid "Select stationery:"
 msgstr "Vælg brevpapir:"
 
@@ -3453,60 +3931,72 @@ msgstr "V
 msgid "Select the gallery to save the image in."
 msgstr "Vælg gallery til at lagre billed i."
 
-#: templates/mailbox/navbar.html:6
+#: templates/fetchmail/fetchmailprefs.html:34
+msgid "Select the mail server type:"
+msgstr "Vælg servertype:"
+
+#: templates/mailbox/navbar.html:7 templates/mailbox/navbar.html:9
 msgid "Select:"
 msgstr "Vælg:"
 
-#: templates/prefs/sourceselect.inc:309
+#: templates/prefs/sourceselect.inc:305 templates/prefs/sourceselect.inc:307
 msgid "Selected Address books:"
 msgstr "Valgte adressekartoteker:"
 
-#: pgp.php:393 templates/pgp/pgp.html:69
+#: templates/contacts/contacts.html:47
+msgid "Selected Addresses"
+msgstr "Valgte adresser:"
+
+#: pgp.php:444 templates/pgp/pgp.html:75
 msgid "Send Key to Public Keyserver"
 msgstr "Send nøgle til offentlig nøgleserver"
 
-#: lib/MIME/Viewer/itip.php:604
+#: lib/MIME/Viewer/itip.php:731
 msgid "Send Latest Information"
 msgstr "Sendt seneste information"
 
-#: templates/compose/compose.html:21 templates/compose/compose.html:206
+#: templates/compose/compose.html:17 templates/compose/compose.html:204
 msgid "Send Message"
 msgstr "Send besked"
 
-#: templates/javascript/compose.js:14 templates/javascript/src/compose.js:125
+#: templates/javascript_defs.php:34
 msgid "Send message without a Subject?"
 msgstr "Afsend besked uden et Emne?"
 
-#: config/prefs.php.dist:765
-msgid "Send read receipt when requested by the sender?"
-msgstr "Send læst-kvittering når anmodet af afsender?"
+#: config/prefs.php.dist:263
+msgid "Sent"
+msgstr "Sendt"
 
-#: lib/IMAP/Tree.php:405
+#: lib/IMAP/Tree.php:2006
 msgid "Sent mail folder"
 msgstr "Mappe for sendte beskeder"
 
-#: templates/prefs/sentmailselect.inc:38
+#: templates/prefs/sentmailselect.inc:36
 msgid "Sent mail folder:"
 msgstr "Mappe til afsendt e-mail:"
 
-#: templates/login/login.html:36 templates/login/login.html:50
+#: lib/api.php:166 templates/login/login.html:36 templates/login/login.html:50
 #: templates/login/login.html:62
 msgid "Server"
 msgstr "Server"
 
-#: config/prefs.php.dist:23
+#: config/prefs.php.dist:25
 msgid "Server and Folder Information"
 msgstr "Server- og mappe-information"
 
-#: config/prefs.php.dist:84
+#: login.php:282 templates/fetchmail/fetchmailprefs.html:63
+msgid "Server:"
+msgstr "Server:"
+
+#: config/prefs.php.dist:110
 msgid "Set preferences for what happens when you move and delete messages."
 msgstr "Vælg hvad der skal ske, når du flytter eller sletter beskeder."
 
-#: config/prefs.php.dist:592
+#: config/prefs.php.dist:573
 msgid "Set the X-Priority header when composing messages?"
 msgstr "Sæt brevhovedet X-Priority ved skrivning af beskeder?"
 
-#: config/prefs.php.dist:31
+#: config/prefs.php.dist:35
 msgid "Share Folders"
 msgstr "Del mapper"
 
@@ -3514,11 +4004,23 @@ msgstr "Del mapper"
 msgid "Share mail folders"
 msgstr "Del besked-mapper"
 
-#: config/prefs.php.dist:32
+#: config/prefs.php.dist:36
 msgid "Share your mail folders with other users."
 msgstr "Del dine postmapper med andre brugere."
 
-#: config/prefs.php.dist:720
+#: lib/IMAP/Tree.php:70
+msgid "Shared Folders"
+msgstr "Delte mapper"
+
+#: templates/pgp/pgp.html:15
+msgid "Should PGP signed messages automatically be verified when viewed?"
+msgstr "Skal PGP signerede beskeder autmatisk verificeres når de vises?"
+
+#: templates/smime/smime.html:7
+msgid "Should S/MIME signed messages automatically be verified when viewed?"
+msgstr "Skal S/MIME signerede beskeder autmatisk verificeres når de vises?"
+
+#: config/prefs.php.dist:913
 msgid ""
 "Should large blocks of quoted text be shown or hidden by default? It can be "
 "toggled easily whichever you choose."
@@ -3530,7 +4032,7 @@ msgstr ""
 msgid "Should the body of text/plain messages be scanned for PGP data?"
 msgstr "Skal brødteksten af text/plain beskeder gennemsøges for PGP-data?"
 
-#: config/prefs.php.dist:565
+#: config/prefs.php.dist:806
 msgid "Should the compose window be closed after saving a draft?"
 msgstr "Skal vinduet med den nye besked lukkes efter lagring af kladde?"
 
@@ -3538,271 +4040,327 @@ msgstr "Skal vinduet med den nye besked lukkes efter lagring af kladde?"
 msgid "Should your PGP public key to be attached to your messages by default?"
 msgstr "Skal det være normalen, at din PGP-nøgle vedhæftes beskeder?"
 
-#: templates/search/search.html:160
+#: templates/search/search.html:144
 msgid "Show All Folders"
 msgstr "Vis alle mapper"
 
-#: message.php:682
+#: message.php:624
 msgid "Show All Headers"
 msgstr "Vis alle brevhoveder"
 
-#: mailbox.php:272
+#: message.php:621
+msgid "Show Common Headers"
+msgstr "Vis almindelige brevhoveder"
+
+#: mailbox.php:257
 msgid "Show Deleted"
 msgstr "Vis slettede"
 
-#: lib/MIME/Viewer/html.php:99
+#: lib/MIME/Viewer/html.php:160
 msgid "Show Images?"
 msgstr "Vis billeder?"
 
-#: message.php:676
-msgid "Show Limited Headers"
-msgstr "Vis normale brevhoveder"
-
-#: message.php:685
+#: message.php:627
 msgid "Show Mailing List Information"
 msgstr "Vis mailliste-information"
 
-#: templates/search/search.html:160
+#: templates/search/search.html:144
 msgid "Show Only Subscribed Folders"
 msgstr "Vis kun aktiverede mapper"
 
-#: folders.php:304
+#: templates/folders/actions.html:39
+msgid "Show Size"
+msgstr "Vis størrelse"
+
+#: folders.php:380
 msgid "Show Unsubscribed"
 msgstr "Vis deaktiverede"
 
-#: config/prefs.php.dist:659
+#: config/prefs.php.dist:847
 msgid "Show an icon to allow stripping of attachments from messages?"
 msgstr ""
-"Vis et pictogram som giver adgang til at fjerne vedhæftelse fra beskeder?"
+"Vis et piktogram som giver adgang til at fjerne vedhæftelse fra beskeder?"
 
-#: config/prefs.php.dist:1074
-msgid "Show legend in the mailbox view?"
-msgstr "Vis symbolforklaring i brevbakkevisningen?"
+#: config/prefs.php.dist:1280
+msgid "Show non-private mailboxes in separate folders"
+msgstr ""
 
-#: config/prefs.php.dist:901
+#: config/prefs.php.dist:1124
 msgid "Show previews for unread messages only?"
 msgstr "Kun forhåndsvisning af ulæste beskeder?"
 
-#: config/prefs.php.dist:909
+#: config/prefs.php.dist:1132
 msgid "Show previews in tooltips?"
 msgstr "Forhåndsvisning i <em>tooltips</em>?"
 
-#: config/prefs.php.dist:494
+#: config/prefs.php.dist:548
 msgid "Show the Bcc: header field when composing mail?"
 msgstr "Vis brevhovedet Bcc: ved skrivning af beskeder?"
 
-#: config/prefs.php.dist:485
+#: config/prefs.php.dist:539
 msgid "Show the Cc: header field when composing mail?"
 msgstr "Vis brevhovedet Cc: ved skrivning af beskeder?"
 
-#: config/prefs.php.dist:938
+#: config/prefs.php.dist:1161
 msgid "Show the Fetch Mail icon on the menubar?"
 msgstr "Vis \"Fetch Mail\" knappen i menuen?"
 
-#: filterprefs.php:98
+#: filterprefs.php:112
 msgid "Show the filter icon on the menubar?"
 msgstr "Vis \"Filter\" knappen i menuen?"
 
-#: lib/MIME/Viewer/html.php:115
+#: lib/MIME/Viewer/html.php:175
 msgid "Show this HTML in a new window?"
 msgstr "Vis dette HTML i et nyt vindue?"
 
-#: lib/Block/summary.php:36
+#: lib/Block/summary.php:30
 msgid "Show total number of mails in folder?"
 msgstr "Vi totalt antal beskeder i mappe?"
 
-#: config/prefs.php.dist:717
+#: config/prefs.php.dist:908
 msgid "Shown"
 msgstr "Vist"
 
-#: mailbox.php:590
+#: mailbox.php:607
 msgid "Si_ze"
 msgstr "Str."
 
-#: mailbox.php:993 templates/mailbox/legend.html:15
-msgid "Signed"
-msgstr "Signeret"
+#: templates/folders/folders_size.html:7
+msgid "Size"
+msgstr "Størrelse"
+
+#: lib/Search.php:762
+msgid "Size (KB) <"
+msgstr "Størrelse (KB) <"
 
-#: templates/compose/compose.html:316
+#: lib/Search.php:768
+msgid "Size (KB) >"
+msgstr "Størrelse (KB) >"
+
+#: templates/compose/compose.html:325
 msgid "Size:"
 msgstr "Størrelse:"
 
-#: mailbox.php:559
+#: mailbox.php:576
 msgid "Sort by Arrival"
 msgstr "Sortér efter modtagelsestidspunkt"
 
-#: mailbox.php:564
+#: mailbox.php:581
 msgid "Sort by Date"
 msgstr "Sortér efter dato"
 
-#: mailbox.php:574
+#: mailbox.php:591
 msgid "Sort by From Address"
 msgstr "Sortér efter afsender-adresse"
 
-#: mailbox.php:589
+#: mailbox.php:606
 msgid "Sort by Message Size"
 msgstr "Sortér efter størrelse"
 
-#: mailbox.php:584
+#: mailbox.php:601
 msgid "Sort by Subject"
 msgstr "Sorter efter emne"
 
-#: mailbox.php:579
+#: mailbox.php:596
 msgid "Sort by Thread"
 msgstr "Sorter efter tråd"
 
-#: mailbox.php:569
+#: mailbox.php:586
 msgid "Sort by To Address"
 msgstr "Sortér efter modtageradresse"
 
-#: lib/IMAP/Tree.php:398
+#: config/prefs.php.dist:329
+msgid "Spam"
+msgstr "Skidtpost"
+
+#: lib/IMAP/Tree.php:1999
 msgid "Spam folder"
 msgstr "Skidtpost-mappe"
 
-#: templates/prefs/spamselect.inc:23
+#: templates/prefs/spamselect.inc:19
 msgid "Spam folder:"
 msgstr "Mappe til spam-beskeder:"
 
-#: compose.php:1235
+#: compose.php:1098
 msgid "Special Characters"
 msgstr "Specielle tegn"
 
-#: search.php:48
+#: search.php:40
 msgid "Special Virtual Folders cannot be edited."
 msgstr "Specielle virtuelle mapper man ikke ændres."
 
-#: compose.php:1231
-msgid "Spell Check"
-msgstr "Stavekontrol"
+#: lib/UI/Compose.php:155
+msgid "Spell Check Failed"
+msgstr "Stavekontrol fejlede"
 
-#: templates/compose/spelling.html:19
-msgid "Spell Checker"
-msgstr "Stavekontrol"
+#: config/prefs.php.dist:660
+msgid "Split Block"
+msgstr "Del blok"
 
-#: compose.php:970
-msgid "Spell check complete"
-msgstr "Stavekontrol afsluttet"
+#: lib/MIME/Viewer/itip.php:599 lib/MIME/Viewer/itip.php:601
+#: lib/MIME/Viewer/itip.php:775 lib/MIME/Viewer/itip.php:777
+msgid "Start:"
+msgstr "Start:"
 
-#: templates/compose/spelling.html:21
-msgid "Spell check complete - No spelling errors"
-msgstr "Stavekontrol afsluttet - Ingen stavefejl"
-
-#: config/prefs.php.dist:523
-msgid "Spelling errors per screen when spell checking."
-msgstr "Stavefejl pr. skærm, når der køres stavekontrol."
-
-#: lib/MIME/Viewer/itip.php:514 lib/MIME/Viewer/itip.php:516
-#: lib/MIME/Viewer/itip.php:649 lib/MIME/Viewer/itip.php:651
-msgid "Start"
-msgstr "Start"
-
-#: compose.php:1216 templates/stationery/prefs.inc:9
+#: compose.php:1056 templates/stationery/stationery.html:8
+#: templates/stationery/stationery.html:12
 msgid "Stationery"
 msgstr "Brevpapir"
 
-#: templates/stationery/prefs.inc:26
+#: stationery.php:135
 msgid "Stationery name:"
 msgstr "Brevpapirnavn:"
 
-#: templates/stationery/prefs.inc:28
+#: stationery.php:137
 msgid "Stationery type:"
 msgstr "Brevpapirtype:"
 
-#: templates/stationery/prefs.inc:33
+#: stationery.php:140
 msgid "Stationery:"
 msgstr "Brevpapir:"
 
-#: lib/MIME/Viewer/itip.php:690 lib/MIME/Viewer/itip.php:813
+#: lib/MIME/Viewer/itip.php:810 lib/MIME/Viewer/itip.php:942
 msgid "Status"
 msgstr "Status"
 
-#: lib/MIME/Contents.php:252
+#: config/prefs.php.dist:629
+msgid "Strikethrough"
+msgstr "Gennemstreg"
+
+#: message.php:684
+msgid "Strip All Attachments"
+msgstr "Fjern alle vedhæftelser"
+
+#: lib/MIME/Contents.php:273
 msgid "Strip Attachment"
 msgstr "Fjern vedhæftelse"
 
-#: config/prefs.php.dist:893
+#: message.php:684
+msgid "Strip Attachments"
+msgstr "Fjern vedhæftelser"
+
+#: config/prefs.php.dist:1116
 msgid "Strip linebreaks?"
 msgstr "Fjern ombrydning?"
 
-#: mailbox.php:585
+#: mailbox.php:602
 msgid "Sub_ject"
 msgstr "Emne"
 
-#: message.php:233 thread.php:152 lib/Search.php:622
-#: templates/login/recompose.html:41
+#: lib/Search.php:731 lib/UI/Message.php:30 templates/login/recompose.html:41
 msgid "Subject"
 msgstr "Emne"
 
-#: config/prefs.php.dist:981
+#: config/prefs.php.dist:1204
 msgid "Subject Field"
 msgstr "Felt for Emne"
 
-#: templates/saveimage/saveimage.html:18 templates/smime/passphrase.html:23
-#: templates/search/search.html:29 templates/search/search.html:198
-#: templates/pgp/passphrase.html:23
+#: templates/thread/thread.html:36
+msgid "Subject:"
+msgstr "Emne:"
+
+#: templates/smime/passphrase.html:23 templates/search/search.html:25
+#: templates/search/search.html:182 templates/saveimage/saveimage.html:19
+#: templates/pgp/passphrase.html:21
 msgid "Submit"
 msgstr "Godkend"
 
-#: templates/folders/actions.html:18
+#: templates/folders/actions.html:25
 msgid "Subscribe"
 msgstr "Abonnér"
 
-#: lib/MIME/Viewer/pgp.php:398 lib/MIME/Viewer/pkcs7.php:385
-#: lib/MIME/Viewer/status.php:87
+#: config/prefs.php.dist:633
+msgid "Subscript"
+msgstr "Sænket skrift"
+
+#: lib/MIME/Viewer/pgp.php:456 lib/MIME/Viewer/pkcs7.php:448
+#: lib/MIME/Viewer/status.php:86
 msgid "Success"
 msgstr "Udført"
 
-#: templates/compose/spelling.html:40
-msgid "Suggestions"
-msgstr "Forslag"
+#: templates/folders/folders_size.html:22
+msgid "Sum"
+msgstr "Sum"
 
-#: lib/MIME/Viewer/itip.php:666 lib/MIME/Viewer/itip.php:668
-#: lib/MIME/Viewer/itip.php:794 lib/MIME/Viewer/itip.php:796
+#: lib/MIME/Viewer/itip.php:792 lib/MIME/Viewer/itip.php:794
+#: lib/MIME/Viewer/itip.php:923 lib/MIME/Viewer/itip.php:925
 msgid "Summary"
-msgstr "Indhold"
+msgstr "Sammendrag"
 
-#: compose.php:1272 compose.php:1273
+#: config/prefs.php.dist:634
+msgid "Superscript"
+msgstr "Hævet skrift"
+
+#: compose.php:1138 compose.php:1139
 msgid "Switch Composition Method"
 msgstr "Skift skrivningsmetode"
 
-#: templates/compose/compose.html:191
+#: templates/compose/compose.html:189
 msgid "Switch to HTML composition"
 msgstr "Skift til HTML-skrivning"
 
-#: templates/compose/compose.html:191
+#: templates/compose/compose.html:189
 msgid "Switch to plain text composition"
 msgstr "Skift til ren tekstskrivning"
 
-#: compose.php:1277
+#: templates/message/navbar_navigate.html:27
+msgid "Target Folder"
+msgstr "Målmappe"
+
+#: templates/mailbox/navbar.html:54
+msgid "Target Mailbox:"
+msgstr "Målmailbox:"
+
+#: lib/IMP.php:525
+msgid "Task Lists"
+msgstr "Opgavelister"
+
+#: config/hooks.php.dist:495
+msgid "Tasks"
+msgstr "Opgaver"
+
+#: compose.php:1143
 msgid "Te_xt"
 msgstr "Tekst"
 
-#: lib/MIME/Viewer/itip.php:273
+#: lib/MIME/Viewer/itip.php:296
 msgid "Tentative: "
 msgstr "Foreløbig: "
 
-#: lib/MIME/Viewer/itip.php:593
+#: lib/MIME/Viewer/itip.php:717
 msgid "Tentatively Accept request"
 msgstr "Acceptér anmodning foreløbigt"
 
-#: lib/MIME/Viewer/itip.php:884
+#: lib/MIME/Viewer/itip.php:1017
 msgid "Tentatively Accepted"
 msgstr "Foreløbigt accepteret"
 
-#: lib/Maintenance/Task/tos_agreement.php:49
+#: lib/Maintenance/Task/tos_agreement.php:46
 #, php-format
 msgid "Terms of Service file not specified in conf.php"
 msgstr "Betingelsesfil ikke angives i conf.php"
 
-#: templates/stationery/prefs.inc:30
+#: templates/stationery/stationery.html:31
 msgid "Text"
 msgstr "Tekst"
 
-#: config/prefs.php.dist:1015
+#: config/prefs.php.dist:624
+msgid "Text Font"
+msgstr "Tekstfont"
+
+#: config/prefs.php.dist:623
+msgid "Text Format"
+msgstr "Tekstformat"
+
+#: config/prefs.php.dist:625
+msgid "Text Size"
+msgstr "Tekststørrelse"
+
+#: config/prefs.php.dist:1245
 msgid "The From: column of the message should be linked:"
 msgstr "Beskedens Fra-kolonne skal refereres:"
 
-#: lib/IMAP/Client.php:525
+#: lib/IMAP/Client.php:432
 msgid ""
 "The IMAP server does not appear to support the authentication method "
 "selected. Please contact your system administrator."
@@ -3810,145 +4368,262 @@ msgstr ""
 "IMAP-serveren synes ikke at understøtte den valgte ægtningsmetode. Kontakt "
 "din systemadministrator."
 
-#: lib/MIME/Viewer/appledouble.php:41
+#: lib/MIME/Viewer/appledouble.php:48
 msgid "The Macintosh resource fork"
 msgstr "<em>Macintosh resource fork</em>"
 
-#: lib/MIME/Viewer/appledouble.php:41
+#: lib/MIME/Viewer/appledouble.php:48
 #, php-format
 msgid "The Macintosh resource fork can be downloaded %s."
 msgstr "<<em>Macintosh resource fork</em> kan hentes %s."
 
-#: fetchmailprefs.php:81
+#: lib/MIME/Viewer/pkcs7.php:255
+#, php-format
+msgid "The S/MIME certificate of %s: "
+msgstr "S/MIME-certifikatet for %s: "
+
+#: fetchmailprefs.php:85
 #, php-format
 msgid "The account \"%s\" has been deleted."
 msgstr "Kontoen \"%s\" er slettet."
 
-#: fetchmailprefs.php:74
+#: fetchmailprefs.php:78
 #, php-format
 msgid "The account \"%s\" has been saved."
 msgstr "Kontoen \"%s\" er gemt."
 
-#: attachment.php:43
+#: attachment.php:44
 msgid "The attachment was not found."
 msgstr "Vedhæftelsen ikke fundet."
 
-#: lib/MIME/Viewer/itip.php:71
+#: config/prefs.php.dist:666
+msgid "The buttons NOT to show when using Xinha."
+msgstr "Knapper der IKKE skal vises når Xinha bruges."
+
+#: config/prefs.php.dist:612
+msgid "The buttons to show when using FCKeditor."
+msgstr "Knapper der vises når der bruges FCKeditor."
+
+#: lib/MIME/Viewer/itip.php:70
 msgid "The calendar data is invalid"
 msgstr "Kalender-data er ugyldig"
 
-#: lib/MIME/Viewer/appledouble.php:42
+#: lib/MIME/Viewer/appledouble.php:49
 msgid "The contents of the Macintosh file are below."
 msgstr "Indholdet af Macintosh-filen forefindes nedenfor."
 
-#: lib/Maintenance/Task/rename_sentmail_monthly.php:85
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:69
 #, php-format
 msgid "The current folder(s) \"%s\" will be renamed to \"%s\"."
 msgstr "De(n) aktuelle mappe(r) \"%s\" vil blive omdøbt til \"%s\"."
 
-#: templates/acl/acl.html:28
+#: templates/acl/acl.html:29
 msgid ""
 "The current list of users with access to this folder could not be retrieved."
 msgstr ""
 "Den aktuelle liste over brugere, som har adgang til denne mappe, kunne ikke "
 "hentes."
 
-#: lib/Compose.php:179
+#: config/prefs.php.dist:964
+msgid "The default charset for messages with no charset information:"
+msgstr "Tegnsæt for beskeder uden tegnsæt-angivelse:"
+
+#: lib/Compose.php:264
 #, php-format
 msgid "The draft has been saved to the \"%s\" folder."
 msgstr "Kladden er gemt i \"%s\" mappen."
 
-#: lib/MIME/Viewer/itip.php:143
+#: lib/MIME/Viewer/itip.php:161
 msgid "The event was added to your calendar."
 msgstr "Hændelsen er indsat i din kalender."
 
-#: lib/Folder.php:298
+#: lib/MIME/Viewer/itip.php:148
+msgid "The event was updated in your calendar."
+msgstr "Hændelsen er opdateret i din kalender."
+
+#: lib/Compose.php:2047
+#, php-format
+msgid "The file %s could not be attached."
+msgstr "Filen %s kunne ikke vedhæftes."
+
+#: lib/Folder.php:284
 #, php-format
 msgid "The folder \"%s\" already exists"
 msgstr "Mappen \"%s\" findes allerede"
 
-#: lib/Folder.php:150
+#: folders.php:248 lib/Folder.php:190
 #, php-format
-msgid ""
-"The folder \"%s\" contains illegal characters in its name. It may cause "
-"problems. Please see your system administrator."
-msgstr ""
-"Mappen \"%s\" indholder ulovlige tegn i navnet. Dette kan føre til "
-"problemer. Kontakt venligst din systemadministrator."
+msgid "The folder \"%s\" may not be deleted."
+msgstr "Mappen \"%s\" må ikke slettes."
 
-#: lib/Folder.php:317
+#: lib/Folder.php:363
 #, php-format
-msgid "The folder \"%s\" was created but you were not subscribed to it."
-msgstr "Mappen \"%s\" blev oprettet, men den blev ikke aktiveret."
+msgid "The folder \"%s\" may not be renamed."
+msgstr "Mappen \"%s\" må ikke omdøbes."
 
-#: lib/Folder.php:229
+#: lib/Folder.php:306
 #, php-format
-msgid "The folder \"%s\" was deleted but you were not unsubscribed from it."
-msgstr "Mappen \"%s\" blev slettet, men den kunne ikke deaktiveres."
+msgid "The folder \"%s\" was created but you were not subscribed to it."
+msgstr "Mappen \"%s\" blev oprettet, men den blev ikke aktiveret."
 
-#: lib/Folder.php:304
+#: lib/Folder.php:293
 #, php-format
 msgid "The folder \"%s\" was not created. This is what the server said"
 msgstr "Mappen \"%s\" blev ikke oprettet. Serverens besked kommer her"
 
-#: lib/Folder.php:222
+#: lib/Folder.php:194
 #, php-format
 msgid "The folder \"%s\" was not deleted. This is what the server said"
 msgstr "Mappen \"%s\" blev ikke slettet. Serverens besked kommer her"
 
-#: lib/Folder.php:320
+#: lib/Folder.php:309
 #, php-format
 msgid "The folder \"%s\" was successfully created."
 msgstr "Mappen \"%s\" er blevet oprettet."
 
-#: lib/Folder.php:232
+#: lib/Folder.php:199
 #, php-format
 msgid "The folder \"%s\" was successfully deleted."
 msgstr "Mappen \"%s\" er blevet slettet."
 
-#: lib/Folder.php:426
+#: lib/Folder.php:383
 #, php-format
 msgid "The folder \"%s\" was successfully renamed to \"%s\"."
 msgstr "Mappen \"%s\" er omdøbt til \"%s\"."
 
-#: lib/MIME/Viewer/tnef.php:94
+#: lib/MIME/Viewer/tnef.php:93
 msgid "The following files were attached to this part:"
 msgstr "Følgende filer er hæftet til denne del:"
 
-#: lib/MIME/Viewer/status.php:75
+#: templates/javascript/popup.js:59
+msgid ""
+"The image save window can not be opened. Perhaps you have set your browser "
+"to block popup windows?"
+msgstr "Billedvinduet kunne ikke åbnes.  Er din popup-blokker aktiveret?"
+
+#: config/prefs.php.dist:603
+msgid "The javascript editor to use on the compose page."
+msgstr "Javascriptseditoren som bruges til at redigere."
+
+#: lib/MIME/Viewer/status.php:74
 msgid "The mail server generated the following error message:"
 msgstr "Mail-serveren genererede følgende fejl-besked:"
 
-#: lib/MIME/Viewer/notification.php:51
+#: lib/MIME/Viewer/notification.php:50
 msgid "The mail server generated the following informational message:"
 msgstr "Mail-serveren dannede denne informative meddelelse:"
 
-#: lib/MIME/Viewer/status.php:90
+#: lib/MIME/Viewer/status.php:89
 msgid "The mail server generated the following message:"
 msgstr "Mail-serveren genererede følgende besked:"
 
-#: lib/Message.php:740
+#: lib/Message.php:797
 #, php-format
 msgid "The mailbox %s is already empty."
 msgstr "Mappen %s allerede tom."
 
-#: lib/Fetchmail.php:247
+#: lib/Fetchmail.php:238
 #, php-format
 msgid "The message \"%s\" from \"%s\" (%d bytes) exceeds fetch size limit."
 msgstr ""
 "Beskeden \"%s\" fra \"%s\" (%d byte) overskrider størrelsesgrænsen ved "
 "hentning."
 
-#: templates/javascript/contacts.js:19
-#: templates/javascript/src/contacts.js:110
+#: templates/javascript_defs.php:48
 msgid "The message being composed has been closed. Exiting."
 msgstr "Beskeden, der skrives på, er lukket. Afslutter."
 
-#: templates/javascript/compose.js:14 templates/javascript/src/compose.js:125
+#: lib/MIME/Viewer/pgp.php:381
+msgid ""
+"The message below does not appear to be a valid PGP encrypted message. "
+"Error: "
+msgstr ""
+"Denne besked synes ikke at være en gyldig PGP-krypteret besked.  Fejl: "
+
+#: lib/MIME/Viewer/pgp.php:252 lib/MIME/Viewer/pgp.php:416
+msgid ""
+"The message below does not appear to be in the correct PGP format (according "
+"to RFC 2015)."
+msgstr ""
+"Denne besked synes ikke at være i korrekt PGP-format (jævnfør RFC 2015)."
+
+#: lib/MIME/Viewer/pgp.php:376
+msgid "The message below has been compressed with PGP."
+msgstr "Denne besked er komprimeret med PGP."
+
+#: lib/MIME/Viewer/pgp.php:201
+msgid ""
+"The message below has been digitally signed and encrypted with PGP, but the "
+"signature cannot be verified."
+msgstr ""
+"Denne besked er digitalt signeret og krypteret via PGP, men signaturen kan "
+"ikke verificeres."
+
+#: lib/MIME/Viewer/pgp.php:207
+msgid "The message below has been digitally signed and encrypted with PGP."
+msgstr "Denne besked er digitalt signeret og krypteret via PGP."
+
+#: lib/MIME/Viewer/pgp.php:203
+msgid ""
+"The message below has been digitally signed with PGP, but the signature "
+"cannot be verified."
+msgstr ""
+"Denne besked er digitalt signeret via PGP, men signaturen kan ikke "
+"verificeres."
+
+#: lib/MIME/Viewer/pgp.php:209
+msgid "The message below has been digitally signed with PGP."
+msgstr "Denne besked er digitalt signeret via PGP."
+
+#: lib/MIME/Viewer/pgp.php:318
+msgid ""
+"The message below has been encrypted with PGP, however, PGP support is "
+"disabled so the message cannot be decrypted."
+msgstr ""
+"Denne besked er blevet krypteret med PGP, men da PGP-understøttelse er slået "
+"fra kan beskeden ikke dekrypteres."
+
+#: lib/MIME/Viewer/pgp.php:360
+msgid ""
+"The message below has been encrypted with PGP, however, no personal private "
+"key exists so the message cannot be decrypted."
+msgstr ""
+"Denne besked er blevet krypteret med PGP, med der findes ingen personlig, "
+"privat nøgle, så beskeden kan ikke dekrypteres."
+
+#: lib/MIME/Viewer/pgp.php:376
+msgid "The message below has been encrypted with PGP."
+msgstr "Denne besked er krypteret med PGP."
+
+#: lib/MIME/Viewer/pgp.php:370
+msgid ""
+"The message below has been encrypted with PGP. You must enter the passphrase "
+"for your PGP private key before it can be decrypted."
+msgstr ""
+"Denne besked er blevet krypteret med PGP. Du skal angive løsenet til din "
+"private PGP-nøgle før besked kan dekrypteres."
+
+#: lib/MIME/Viewer/pgp.php:353
+msgid ""
+"The message below has been encrypted with PGP. You must enter the passphrase "
+"that was used to encrypt this message."
+msgstr ""
+"Denne besked er blevet krypteret med PGP. Du skal angive løsenet til din "
+"private PGP-nøgle før besked kan dekrypteres."
+
+#: lib/MIME/Viewer/pgp.php:460
+msgid "The message below has been verified."
+msgstr "Beskeden er verificeret."
+
+#: lib/Crypt/PGP.php:382
+msgid "The message below has not been digitally signed or encrypted with PGP."
+msgstr "Beskeden er ikke digitalt signeret eller krypteret via PGP."
+
+#: templates/javascript_defs.php:34
 msgid "The message does not have a Subject entered."
 msgstr "Beskeden har ikke noget Emne."
 
-#: lib/Spam.php:217
+#: lib/Filter.php:72 lib/Spam.php:222
 msgid "The message has been deleted."
 msgstr "Beskeden er slettet."
 
@@ -3970,24 +4645,24 @@ msgstr ""
 msgid "The message has been reported as spam."
 msgstr "Beskeden er blevet indberettet som skidtpost."
 
-#: lib/MIME/Viewer/pgp.php:402
-msgid "The message has been verified."
-msgstr "Beskeden er verificeret."
-
-#: lib/MIME/Viewer/pkcs7.php:390
+#: lib/MIME/Viewer/pkcs7.php:453
 #, php-format
 msgid "The message has been verified. Sender: %s."
 msgstr "Beskeden er verificeret. Afsender: %s."
 
-#: lib/MIME/Viewer/tnef.php:60
+#: lib/Filter.php:74
+msgid "The messages have been deleted."
+msgstr "Beskederne er slettet."
+
+#: lib/MIME/Viewer/tnef.php:59
 msgid "The requested file does not exist in the MS-TNEF attachment."
 msgstr "Den forespurgte fil findes ikke i MS-TNEF-vedhænget."
 
-#: lib/MIME/Viewer/zip.php:64
+#: lib/MIME/Viewer/zip.php:67
 msgid "The requested file does not exist in the Zip attachment."
 msgstr "Den forespurgte fil findes ikke i Zip-vedhænget."
 
-#: message.php:426
+#: message.php:448
 #, php-format
 msgid ""
 "The sender of this message is requesting a Message Disposition Notification "
@@ -3998,55 +4673,66 @@ msgstr ""
 "Notification (MDN)</em> fra dig, når du har læst beskeden.  Click %s for at "
 "afsende notitsen."
 
-#: lib/MIME/Viewer/images.php:67
-msgid "The server was not able to create a thumbnail of this image."
-msgstr "Serveren kunne ikke danne et frimærke af billedet."
-
-#: templates/javascript/compose.js:11 templates/javascript/src/compose.js:89
+#: templates/javascript_defs.php:33
 msgid "The signature could not be replaced."
 msgstr "Din signatur kunne ikke erstattes."
 
-#: templates/javascript/compose.js:11 templates/javascript/src/compose.js:87
+#: templates/javascript_defs.php:32
 msgid "The signature was successfully replaced."
 msgstr "Din signatur er blevet rettet."
 
-#: attachment.php:59
-msgid "The specified file does not exist."
-msgstr "Den forespurgte file findes ikke."
+#: attachment.php:60
+msgid ""
+"The specified attachment does not exist. It may have been deleted by the "
+"original sender."
+msgstr ""
+"Det pågældende bilag findes ikke. Det kan være blevet slettet af afsenderen."
+
+#: attachment.php:129
+msgid "The specified file cannot be read."
+msgstr "Den forespurgte fil kan ikke læses."
 
-#: stationery.php:85
+#: stationery.php:84
 #, php-format
 msgid "The stationery \"%s\" has been added."
 msgstr "Brevpapiret \"%s\" er tilføjet."
 
-#: stationery.php:63
+#: stationery.php:74
 #, php-format
 msgid "The stationery \"%s\" has been deleted."
 msgstr "Brevpapiret \"%s\" er slettet."
 
-#: stationery.php:88
+#: stationery.php:87
 #, php-format
 msgid "The stationery \"%s\" has been updated."
 msgstr "Brevpapiret \"%s\" er ændret."
 
-#: lib/MIME/Viewer/itip.php:173
+#: lib/Compose.php:972
+msgid ""
+"The system is not properly configured. A detailed error description has been "
+"logged for the administrator."
+msgstr ""
+"Systemet er ikke korrekt konfigureret. En detailjeret fejlmeddelelse er "
+"blevet gemt til administratoren."
+
+#: lib/MIME/Viewer/itip.php:192
 msgid "The task has been added to your tasklist."
 msgstr "Opgaven til sat på din opgaveliste."
 
-#: lib/MIME/Viewer/status.php:95
+#: lib/MIME/Viewer/status.php:94
 msgid "The text of the message"
 msgstr "Brødteksten"
 
-#: lib/MIME/Viewer/status.php:94
+#: lib/MIME/Viewer/status.php:93
 #, php-format
 msgid "The text of the message can be viewed %s."
 msgstr "Beskedens brødtekst kan ses %s."
 
-#: lib/MIME/Viewer/status.php:80
+#: lib/MIME/Viewer/status.php:79
 msgid "The text of the returned message"
 msgstr "Den returnerede beskeds brødtekst"
 
-#: lib/MIME/Viewer/status.php:79
+#: lib/MIME/Viewer/status.php:78
 #, php-format
 msgid "The text of the returned message can be viewed %s."
 msgstr "Den returnerede beskeds brødtekst kan ses %s."
@@ -4060,11 +4746,11 @@ msgstr "Br
 msgid "The text of the sent message can be viewed %s."
 msgstr "Den afsendte beskeds brødtekst kan ses %s."
 
-#: lib/MIME/Viewer/itip.php:158
+#: lib/MIME/Viewer/itip.php:177
 msgid "The user's free/busy information was sucessfully stored."
 msgstr "Brugerens ledig/optaget-information er gemt."
 
-#: lib/MIME/Viewer/alternative.php:57
+#: lib/MIME/Viewer/alternative.php:56
 msgid "There are no alternative parts that can be displayed."
 msgstr "Der findes ikke nogen alternativ del, som kan vises."
 
@@ -4072,16 +4758,11 @@ msgstr "Der findes ikke nogen alternativ del, som kan vises."
 msgid "There are no messages in this mailbox."
 msgstr "Der er ingen beskeder in denne brevbakke."
 
-#: thread.php:109
+#: thread.php:104
 msgid "There is no text that can be displayed inline."
 msgstr "Der findes ingen brødtekst, som kan vises indlejret."
 
-#: lib/Message.php:744
-#, php-format
-msgid "There was a problem expunging the mailbox. The server said: %s"
-msgstr "Der opstod et problem under tømning af mailboxen. Serveren svarede: %s"
-
-#: lib/Message.php:134
+#: lib/Message.php:140
 #, php-format
 msgid ""
 "There was an error copying messages from \"%s\" to \"%s\". This is what the "
@@ -4090,7 +4771,7 @@ msgstr ""
 "Der opstod en fejl under kopiering af beskeder fra \"%s\" til \"%s\". "
 "Serveren skriver"
 
-#: lib/Message.php:258
+#: lib/Message.php:270
 #, php-format
 msgid ""
 "There was an error deleting messages from the folder \"%s\". This is what "
@@ -4099,25 +4780,15 @@ msgstr ""
 "Der opstod en fejl under fjernelse af beskeder fra mappen \"%s\". Her er "
 "beskeden fra serveren"
 
-#: lib/Message.php:346
-#, php-format
-msgid ""
-"There was an error deleting messages in the folder \"%s\". This is what the "
-"server said"
-msgstr ""
-"Der opstod en fejl under sletningen af beskeder i mappen \"%s\". Her er "
-"beskeden fra serveren"
-
-#: lib/MIME/Viewer/itip.php:103
-#, php-format
-msgid "There was an error deleting the event: %s."
-msgstr "Der opstod en fejl under sletning af hændelsen: %s."
+#: lib/MIME/Viewer/itip.php:101
+msgid "There was an error deleting the event:"
+msgstr "Der opstod en fejl under sletning af hændelsen:"
 
-#: lib/MIME/Viewer/enriched.php:37 lib/MIME/Viewer/plain.php:52
+#: lib/MIME/Viewer/enriched.php:36 lib/MIME/Viewer/plain.php:50
 msgid "There was an error displaying this message part"
 msgstr "Der opstod en fejl under visning af denne beskeddel"
 
-#: lib/Message.php:623
+#: lib/Message.php:634
 #, php-format
 msgid ""
 "There was an error flagging messages in the folder \"%s\". This is what the "
@@ -4126,29 +4797,25 @@ msgstr ""
 "Der opstod en fejl under markering af beskeder i mappen \"%s\". Dette er "
 "beskeden fra serveren"
 
-#: folders.php:113
+#: folders.php:148
 #, php-format
 msgid "There was an error importing %s."
 msgstr "Der opstod en fejl under importeringen af %s."
 
-#: lib/MIME/Viewer/itip.php:140
-#, php-format
-msgid "There was an error importing the event: %s."
-msgstr "Der opstod en fejl under importeringen af hændelse: %s."
+#: lib/MIME/Viewer/itip.php:158
+msgid "There was an error importing the event:"
+msgstr "Der opstod en fejl under importen af hændelsen:"
 
-#: lib/MIME/Viewer/itip.php:170
-#, php-format
-msgid "There was an error importing the task: %s."
-msgstr "Der opstod en fejl under importeringen af opgaven: %s."
+#: lib/MIME/Viewer/itip.php:189
+msgid "There was an error importing the task:"
+msgstr "Der opstod en fejl under importen af opgaven:"
 
-#: lib/MIME/Viewer/itip.php:156
-#, php-format
-msgid "There was an error importing user's free/busy information: %s."
+#: lib/MIME/Viewer/itip.php:175
+msgid "There was an error importing user's free/busy information:"
 msgstr ""
-"Der opstod en fejl under importeringen af brugers\n"
-"ledig/optaget information: %s"
+"Der opstod en fejl under importen af brugers ledig/optaget information:"
 
-#: lib/Message.php:127
+#: lib/Message.php:136
 #, php-format
 msgid ""
 "There was an error moving messages from \"%s\" to \"%s\". This is what the "
@@ -4157,50 +4824,53 @@ msgstr ""
 "Der opstod en fejl under flytningen af beskeder fra \"%s\" til \"%s\".\n"
 "Serveren skrev"
 
-#: lib/Compose.php:562
+#: lib/Compose.php:748
 #, php-format
 msgid "There was an error sending your message: %s"
 msgstr "Der opstod en fejl under afsendelsen af din besked: %s"
 
-#: lib/MIME/Viewer/itip.php:117
-#, php-format
-msgid "There was an error updating the event: %s."
-msgstr "Der opstod en fejl under ændringen af hændelsen: %s."
+#: lib/MIME/Viewer/itip.php:115 lib/MIME/Viewer/itip.php:144
+msgid "There was an error updating the event:"
+msgstr "Der opstod en fejl under opdatering af hændelsen:"
 
-#: lib/MIME/Viewer/pgp.php:165
+#: lib/MIME/Viewer/pgp.php:166
 msgid "This PGP Public Key was attached to the message."
 msgstr "Denne offentlige PGP-nøgle er hæftet ved beskeden."
 
-#: lib/MIME/Viewer/itip.php:108 lib/MIME/Viewer/itip.php:122
-#: lib/MIME/Viewer/itip.php:147 lib/MIME/Viewer/itip.php:161
-#: lib/MIME/Viewer/itip.php:177 lib/MIME/Viewer/itip.php:318
+#: lib/MIME/Viewer/itip.php:106 lib/MIME/Viewer/itip.php:120
+#: lib/MIME/Viewer/itip.php:166 lib/MIME/Viewer/itip.php:180
+#: lib/MIME/Viewer/itip.php:196 lib/MIME/Viewer/itip.php:345
 msgid "This action is not supported."
 msgstr "Denne handling er ikke understøttet."
 
-#: lib/MIME/Viewer/itip.php:183 lib/MIME/Viewer/itip.php:423
+#: lib/MIME/Viewer/itip.php:202 lib/MIME/Viewer/itip.php:458
 msgid "This action is not yet implemented."
 msgstr "Denne handling er endnu ikke implementeret."
 
-#: templates/javascript/folders.js:20 templates/javascript/src/folders.js:117
+#: templates/javascript_defs.php:61
+msgid "This folder may not be renamed:"
+msgstr "Denne mappe kan ikke omdøbed:"
+
+#: templates/javascript_defs.php:58
 msgid "This may take some time. Are you sure you want to continue?"
 msgstr "Dette tager nok noget tid. Er du sikker på, at du vil fortsætte ?"
 
-#: lib/MIME/Viewer/appledouble.php:40
+#: lib/MIME/Viewer/appledouble.php:47
 msgid "This message contains a Macintosh file."
 msgstr "Beskeden indeholder en Macintosh-fil."
 
-#: lib/MIME/Viewer/pkcs7.php:416
+#: lib/MIME/Viewer/pkcs7.php:479
 msgid ""
 "This message contains an attachment that has been digitally signed via S/"
 "MIME."
 msgstr ""
 "Beskeden medbringer en vedhæftelse, som er digitalt signeret via S/MIME."
 
-#: lib/MIME/Viewer/pkcs7.php:420
+#: lib/MIME/Viewer/pkcs7.php:483
 msgid "This message contains an attachment that has been encrypted via S/MIME."
 msgstr "Beskeden medbringer en vedhæftelse, som er krypteret via S/MIME."
 
-#: lib/MIME/Viewer/status.php:162
+#: lib/MIME/Viewer/status.php:159
 msgid ""
 "This message contains mail delivery status information, but the format of "
 "this message is unknown."
@@ -4208,112 +4878,92 @@ msgstr ""
 "Beskeden indeholder <em>mail delivery status</em> information, men formatet "
 "af beskeden er ukendt."
 
-#: lib/MIME/Viewer/pgp.php:324
-msgid ""
-"This message does not appear to be a valid PGP encrypted message. Error: "
-msgstr "Beskeden synes ikke at være en gyldig PGP-krypteret besked.  Fejl: "
-
-#: lib/MIME/Viewer/pgp.php:243 lib/MIME/Viewer/pgp.php:359
-msgid ""
-"This message does not appear to be in the correct PGP format (according to "
-"RFC 2015)."
-msgstr "Beskeden synes ikke at være i korrekt PGP-format (jævnfør RFC 2015)."
-
-#: lib/MIME/Viewer/pkcs7.php:170
+#: lib/MIME/Viewer/pkcs7.php:201
 msgid "This message does not appear to be in the correct S/MIME format."
 msgstr "Beskeden synes ikke at være i korrekt S/MIME-format."
 
-#: lib/MIME/Viewer/pgp.php:200
-msgid ""
-"This message has been digitally signed and encrypted with PGP, but the "
-"signature cannot be verified."
-msgstr ""
-"Beskeden er digitalt signeret og krypteret via PGP, men signaturen kan ikke "
-"verificeres."
-
-#: lib/MIME/Viewer/pgp.php:206
-msgid "This message has been digitally signed and encrypted with PGP."
-msgstr "Beskeden er digitalt signeret og krypteret via PGP."
-
-#: lib/MIME/Viewer/pgp.php:202
-msgid ""
-"This message has been digitally signed via PGP, but the signature cannot be "
-"verified."
-msgstr ""
-"Beskeden er digitalt signeret via PGP, men signaturen kan ikke verificeres."
-
-#: lib/MIME/Viewer/pgp.php:208
-msgid "This message has been digitally signed via PGP."
-msgstr "Beskeden er digitalt signeret via PGP."
-
-#: lib/MIME/Viewer/pkcs7.php:143
+#: lib/MIME/Viewer/pkcs7.php:174
 msgid "This message has been digitally signed via S/MIME."
 msgstr "Beskeden er digitalt signeret via S/MIME."
 
-#: lib/MIME/Viewer/pkcs7.php:139 lib/MIME/Viewer/pkcs7.php:238
+#: lib/MIME/Viewer/pkcs7.php:170 lib/MIME/Viewer/pkcs7.php:297
 msgid "This message has been encrypted via S/MIME."
 msgstr "Beskeden er krypteret via S/MIME."
 
-#: lib/MIME/Viewer/pgp.php:297
-msgid ""
-"This message has been encrypted with PGP, however, PGP support is disabled "
-"so the message cannot be decrypted."
-msgstr ""
-"Denne besked er blevet krypteret med PGP, men da PGP-understøttelse er slået "
-"fra kan beskeden ikke dekrypteres."
+#: lib/MIME/Contents.php:449
+msgid "This message part cannot be viewed because it is too large."
+msgstr "Denne beskeddel kan ikke vises, da den er for stor."
 
-#: lib/MIME/Viewer/pgp.php:303
-msgid ""
-"This message has been encrypted with PGP, however, no personal private key "
-"exists so the message cannot be decrypted."
-msgstr ""
-"Denne besked er blevet krypteret med PGP, med der findes ingen personlig, "
-"privat nøgle, så beskeden kan ikke dekrypteres."
-
-#: lib/MIME/Viewer/pgp.php:314
-msgid "This message has been encrypted with PGP."
-msgstr "Beskeden er krypteret med PGP."
+#: message.php:521
+msgid "This message to"
+msgstr "Denne besked til"
 
-#: lib/MIME/Viewer/pgp.php:310
+#: lib/IMP.php:338
+#, php-format
 msgid ""
-"This message has been encrypted with PGP. You must enter the passphrase for "
-"your PGP private key before it can be decrypted."
+"This request cannot be completed because the link you followed or the form "
+"you submitted was only valid for %d minutes. Please try again now."
 msgstr ""
-"Denne besked er blevet krypteret med PGP. Du skal angive løsenet til din "
-"private PGP-nøgle før besked kan dekrypteres."
 
-#: message.php:509
-msgid "This message to"
-msgstr "Denne besked til"
-
-#: acl.php:46
+#: acl.php:47
 msgid "This server does not support sharing folders."
 msgstr "Denne server understøtter ikke deling af mapper."
 
-#: templates/javascript/contacts.js:20
-#: templates/javascript/src/contacts.js:116
+#: templates/javascript_defs.php:49
 msgid "This window must be called from a compose window."
 msgstr "Dette vindue skal anråbes fra en skrivningsvindue."
 
-#: thread.php:154
-msgid "Thread Display"
-msgstr "Trådet visning"
+#: templates/thread/thread.html:2
+msgid "Thread Display:"
+msgstr "Trådet visning:"
 
-#: thread.php:75 config/prefs.php.dist:983
+#: thread.php:177 config/prefs.php.dist:1206
 msgid "Thread View"
 msgstr "Trådet visning"
 
-#: compose.php:876 mailbox.php:570 mailbox.php:755 message.php:229
-#: lib/Search.php:610 templates/login/recompose.html:14
-#: templates/contacts/contacts.html:39
+#: lib/MIME/Viewer/pdf.php:103
+msgid "Thumbnail of attached PDF file"
+msgstr "Miniature af vedlagt PDF fil"
+
+#: lib/MIME/Viewer/images.php:167
+msgid "Thumbnail of attached image"
+msgstr "Miniature af vedlagt billede"
+
+#: compose.php:831 mailbox.php:587 lib/Search.php:716 lib/UI/Mailbox.php:90
+#: lib/UI/Message.php:26 templates/login/recompose.html:14
+#: templates/contacts/contacts.html:40
 msgid "To"
 msgstr "Til"
 
-#: config/prefs.php.dist:980
+#: config/prefs.php.dist:1203
 msgid "To Address"
 msgstr "To: Adresse"
 
-#: templates/prefs/sourceselect.inc:326
+#: message.php:565
+msgid "To All"
+msgstr "Til alle"
+
+#: message.php:561
+msgid "To List"
+msgstr "Til liste"
+
+#: message.php:558
+msgid "To Sender"
+msgstr "Til afsender"
+
+#: message.php:565
+msgid "To _All"
+msgstr "Til _alle"
+
+#: message.php:561
+msgid "To _List"
+msgstr "Til _liste"
+
+#: templates/compose/redirect.html:47
+msgid "To field"
+msgstr "brevhovede"
+
+#: templates/prefs/sourceselect.inc:324
 msgid ""
 "To select multiple fields, hold down the Control (PC) or Command (Mac) while "
 "clicking."
@@ -4321,257 +4971,330 @@ msgstr ""
 "For at markere flere felter skal du holde Ctrl (PC) eller Command (Mac) "
 "nede, medens du klikker."
 
-#: lib/IMAP/Client.php:134
+#: config/prefs.php.dist:514
+msgid "To the stationery and form responses."
+msgstr "Til brevpapir og formular-svar."
+
+#: lib/IMAP/Client.php:131
 msgid ""
 "To use a TLS connection, you must be running a version of PHP 5.1.0 or "
 "higher."
 msgstr ""
 "For at bruge en TLS-forbindelse skal du anvende PHP 5.1.0 eller højere."
 
-#: templates/compose/compose.html:351
-msgid "Total Attachments Size:"
-msgstr "Vedhæftelsers totale størrelse:"
+#: thread.php:117 templates/thread/thread.html:31
+msgid "To:"
+msgstr "Til:"
 
-#: lib/IMAP/Tree.php:385
+#: config/prefs.php.dist:659
+msgid "Toggle Borders"
+msgstr "Skift kanter"
+
+#: config/prefs.php.dist:663
+msgid "Toggle HTML Source"
+msgstr "Skift HTML tekst"
+
+#: config/prefs.php.dist:683
+msgid "Top"
+msgstr "Top"
+
+#: templates/compose/compose.html:317
+msgid "Total Size:"
+msgstr "Total størrelse:"
+
+#: login.php:263
+msgid "Traditional"
+msgstr "Traditionel"
+
+#: config/prefs.php.dist:316
+msgid "Trash"
+msgstr "Skrald"
+
+#: lib/IMAP/Tree.php:1986
 msgid "Trash folder"
 msgstr "Skraldespand"
 
-#: templates/prefs/trashselect.inc:23
+#: templates/prefs/trashselect.inc:18
 msgid "Trash folder:"
 msgstr "Skraldespand:"
 
-#: lib/Quota/command.php:71 lib/Quota/courier.php:53 lib/Quota/cyrus.php:64
-#: lib/Quota/logfile.php:88 lib/Quota/mdaemon.php:48
-#: lib/Quota/mercury32.php:79
+#: lib/MIME/Viewer/itip.php:144
+msgid "Trying to import the event instead."
+msgstr "Forsøger at importere hændelsen i stedet"
+
+#: lib/Quota/sql.php:73
+msgid "Unable to connect to SQL server."
+msgstr "Kunne ikke opnå forbindelse til SQL serveren."
+
+#: lib/Quota/command.php:91 lib/Quota/hook.php:42 lib/Quota/imap.php:42
+#: lib/Quota/logfile.php:85 lib/Quota/maildir.php:111 lib/Quota/mdaemon.php:45
+#: lib/Quota/mercury32.php:68
 msgid "Unable to retrieve quota"
 msgstr "Kunne ikke hente kvote"
 
-#: templates/message/navbar_navigate.html:10 templates/mailbox/navbar.html:16
-#: templates/mailbox/navbar.html:31
+#: templates/message/navbar_navigate.html:13 templates/mailbox/navbar.html:19
+#: templates/mailbox/navbar.html:35
 msgid "Unanswered"
 msgstr "Ubesvaret"
 
-#: search.php:340
+#: lib/Search.php:802
 msgid "Unanswered messages"
 msgstr "Ubesvarede beskeder"
 
-#: mailbox.php:471 message.php:539
+#: mailbox.php:514 message.php:552
 msgid "Undelete"
 msgstr "Fortryd sletning"
 
-#: search.php:350
+#: lib/Search.php:822
 msgid "Undeleted messages"
 msgstr "Uslettede beskeder"
 
-#: mailbox.php:733 mailbox.php:751 lib/MIME/Headers.php:213
+#: config/prefs.php.dist:628
+msgid "Underline"
+msgstr "Understreg"
+
+#: lib/UI/Mailbox.php:67 lib/UI/Mailbox.php:86 lib/MIME/Headers.php:254
 msgid "Undisclosed Recipients"
 msgstr "Ikke viste modtagere"
 
-#: lib/IMAP/Client.php:556
+#: config/prefs.php.dist:647
+msgid "Undoes your last action"
+msgstr "Fortryder din sidste handling"
+
+#: lib/IMAP/Client.php:462
 msgid "Unexpected response from server to AUTHENTICATE command."
 msgstr "Uventet reaktion fra server ved AUTHENTICATE kommando."
 
-#: lib/IMAP/Client.php:520
+#: lib/IMAP/Client.php:428
 msgid "Unexpected response from server to Digest-MD5 response."
 msgstr "Uventet reaktion fra server ved Digest-MD5 respons."
 
-#: lib/IMAP/Client.php:536
-msgid "Unexpected response from server to LOGIN command."
-msgstr "Uventet reaktion fra server ved LOGIN kommando."
+#: lib/Search.php:812
+msgid "Unflagged messages"
+msgstr "Umærkede beskeder"
 
-#: lib/MIME/Viewer/itip.php:455
+#: lib/MIME/Viewer/itip.php:492
 #, php-format
 msgid "Unhandled component of type: %s"
 msgstr "Uhåndteret komponent af type: %s"
 
-#: search.php:345
-msgid "Unimportant messages"
-msgstr "Uvigtige beskeder"
+#: lib/MIME/Viewer/itip.php:813
+msgid "Unknown"
+msgstr "Ukendt"
 
-#: mailbox.php:711
+#: lib/UI/Mailbox.php:206 lib/UI/Mailbox.php:209 lib/UI/Mailbox.php:213
 msgid "Unknown Date"
 msgstr "Ukendt dato"
 
-#: lib/IMAP/Client.php:395
+#: lib/IMAP/Client.php:205
 #, php-format
 msgid "Unknown IMAP response from the server. Server Responded: %s"
 msgstr "Ukendt IMAP respons fra serveren. Server meldte: %s"
 
-#: lib/MIME/Viewer/itip.php:633
+#: lib/MIME/Viewer/itip.php:759
 msgid "Unknown Meeting"
 msgstr "Ukendt møde"
 
-#: mailbox.php:767
+#: lib/UI/Mailbox.php:105
 msgid "Unknown Recipient"
 msgstr "Ukendt modtager"
 
-#: lib/MIME/Viewer/itip.php:774
+#: lib/MIME/Viewer/itip.php:903
 msgid "Unknown Task"
 msgstr "Ukendt opgave"
 
-#: pgp.php:396 smime.php:320
+#: pgp.php:447 smime.php:346
 msgid "Unload Passphrase"
 msgstr "Ophæv løsen"
 
-#: fetchmailprefs.php:65
+#: fetchmailprefs.php:69
 msgid "Unnamed"
 msgstr "Ikke navngivet"
 
-#: mailbox.php:820 mailbox.php:979 message.php:466
-#: templates/message/navbar_navigate.html:6 templates/mailbox/legend.html:3
-#: templates/mailbox/navbar.html:12 templates/mailbox/navbar.html:27
+#: mailbox.php:757 message.php:474 templates/message/navbar_navigate.html:9
+#: templates/mailbox/navbar.html:15 templates/mailbox/navbar.html:31
 msgid "Unseen"
 msgstr "Ulæst"
 
-#: templates/folders/actions.html:19
+#: lib/Search.php:792
+msgid "Unseen messages"
+msgstr "Ulæste beskeder"
+
+#: templates/folders/actions.html:26
 msgid "Unsubscribe"
 msgstr "Afabonnér"
 
-#: templates/compose/compose.html:286
+#: templates/compose/compose.html:291
 msgid "Update"
 msgstr "Opdatér"
 
-#: lib/MIME/Viewer/itip.php:619
+#: lib/MIME/Viewer/itip.php:711 lib/MIME/Viewer/itip.php:751
+msgid "Update in my calendar"
+msgstr "Opdater i min kalender"
+
+#: lib/MIME/Viewer/itip.php:738
 msgid "Update respondent status"
 msgstr "Opdatér status on respondent"
 
+#: lib/MIME/Viewer/itip.php:725
+msgid "Update this event on my calendar"
+msgstr "Opdater denne hændelse i min kalender"
+
 #: templates/smime/import_key.html:40 templates/pgp/import_key.html:38
 msgid "Upload:"
 msgstr "Læg op:"
 
-#: templates/prefs/sentmailselect.inc:41
+#: templates/prefs/sentmailselect.inc:39
 msgid "Use Default Value"
 msgstr "Brug standardværdi"
 
-#: config/prefs.php.dist:260
+#: config/prefs.php.dist:291
 msgid "Use IMAP folder subscriptions?"
 msgstr "Brug IMAP mappe aktiveringer?"
 
-#: config/prefs.php.dist:797
-msgid "Use Virtual Trash Folder?"
-msgstr "Anvend virtuel skraldespand?"
+#: templates/prefs/trashselect.inc:24
+msgid "Use Virtual Trash"
+msgstr "Brug virtuel skraldespand"
 
-#: templates/acl/acl.html:69
+#: templates/acl/acl.html:42
 msgid "User"
 msgstr "Bruger"
 
-#: acl.php:87
+#: acl.php:90 acl.php:131
 #, php-format
 msgid ""
 "User \"%s\" successfully given the specified rights for the folder \"%s\"."
 msgstr "Bruger \"%s\" tildelt de givne rettigheder til mappe \"%s\"."
 
-#: templates/login/login.html:83
+#: lib/api.php:188 templates/login/login.html:85
 msgid "Username"
 msgstr "Brugernavn"
 
-#: templates/smime/smime.html:25 templates/smime/smime.html:61
-#: templates/smime/smime.html:65 templates/pgp/pgp.html:34
-#: templates/pgp/pgp.html:69 templates/pgp/pgp.html:74
+#: templates/fetchmail/fetchmailprefs.html:55
+msgid "Username:"
+msgstr "Brugernavn:"
+
+#: templates/login/mobile.inc:14
+msgid "Username: "
+msgstr "Brugernavn: "
+
+#: lib/MIME/Viewer/pkcs7.php:256 templates/smime/smime.html:35
+#: templates/smime/smime.html:67 templates/smime/smime.html:71
+#: templates/pgp/pgp.html:43 templates/pgp/pgp.html:75
+#: templates/pgp/pgp.html:80
 msgid "View"
 msgstr "Se"
 
-#: lib/MIME/Viewer/tnef.php:110 lib/MIME/Viewer/zip.php:92
+#: lib/MIME/Viewer/tnef.php:109 lib/MIME/Viewer/zip.php:99
 #, php-format
 msgid "View %s"
 msgstr "Vis %s"
 
-#: pgp.php:368 smime.php:294
+#: pgp.php:417 smime.php:318
 #, php-format
 msgid "View %s Public Key"
 msgstr "Se %s offentlig nøgle"
 
-#: mailbox.php:519
+#: lib/MIME/Viewer/images.php:157 lib/MIME/Viewer/images.php:162
+#: lib/MIME/Viewer/pdf.php:93 lib/MIME/Viewer/pdf.php:98
+msgid "View Attachment"
+msgstr "Se vedhæftelse"
+
+#: mailbox.php:547
 msgid "View Messages"
 msgstr "Se beskeder"
 
-#: pgp.php:397 smime.php:321
+#: pgp.php:448 smime.php:347
 msgid "View Personal Private Key"
 msgstr "Se egen privat nøgle"
 
-#: pgp.php:391 smime.php:317
+#: pgp.php:442 smime.php:343
 msgid "View Personal Public Key"
 msgstr "Se egen offentlig nøgle"
 
-#: message.php:563
+#: message.php:576
 msgid "View Thread"
 msgstr "Se tråd"
 
-#: lib/MIME/Viewer/images.php:164 lib/MIME/Viewer/images.php:166
-msgid "View Thumbnail"
-msgstr "Se frimærke"
-
-#: lib/MIME/Viewer/pkcs7.php:424
+#: lib/MIME/Viewer/pkcs7.php:487
 msgid "View attachment in a separate window"
 msgstr "Se vedhæftelser i et seperat vindue"
 
-#: lib/MIME/Viewer/related.php:78
+#: lib/MIME/Viewer/related.php:85
 msgid "View content in a separate window"
 msgstr "Se indhold i et seperat vindue."
 
-#: lib/MIME/Viewer/itip.php:144
+#: lib/MIME/Viewer/itip.php:149 lib/MIME/Viewer/itip.php:162
 msgid "View event"
 msgstr "Se hændelse"
 
-#: mailbox.php:670 lib/IMAP/Tree.php:367
+#: folders.php:436 mailbox.php:695
 #, php-format
 msgid "View messages in %s"
 msgstr "Se besked i %s"
 
-#: templates/prefs/initialpageselect.inc:23
+#: templates/prefs/initialpageselect.inc:16
 msgid "View or mailbox to display after login:"
 msgstr "Visning eller brevbakke, som vise efter login:"
 
-#: lib/MIME/Viewer/itip.php:174
+#: lib/MIME/Viewer/itip.php:193
 msgid "View task"
 msgstr "Se opgave"
 
-#: search.php:157
+#: mailbox.php:366 mailbox.php:367
+msgid "Virtual Folder"
+msgstr "Virtuel mappe"
+
+#: search.php:90
 #, php-format
 msgid "Virtual Folder \"%s\" created succesfully."
 msgstr "Virtuel mappe \"%s\" er dannet."
 
-#: lib/IMAP/Tree.php:149 lib/IMAP/Tree.php:162 lib/IMAP/Tree.php:164
-#: lib/IMAP/Tree.php:168 lib/IMAP/Tree.php:169 lib/IMAP/Tree.php:676
-#: lib/IMAP/Tree.php:700 lib/IMAP/Tree.php:738
-#: templates/search/search.html:182
+#: lib/IMAP/Tree.php:66 templates/search/search.html:166
 msgid "Virtual Folders"
 msgstr "Virtuelle mapper"
 
-#: search.php:149
+#: search.php:85
 msgid "Virtual Folders require a label."
 msgstr "Virtuelle mapper kræver en vignet."
 
-#: lib/Search.php:408
+#: lib/Search.php:441
 msgid "Virtual INBOX"
 msgstr "Virtuel indbakke"
 
-#: lib/IMAP/Tree.php:424
+#: lib/IMAP/Tree.php:2026
 msgid "Virtual INBOX Folder"
 msgstr "Virtuel indbakke mappe"
 
-#: lib/Search.php:354
+#: lib/Search.php:385
 msgid "Virtual Trash"
 msgstr "Virtuel skraldespand"
 
-#: lib/IMAP/Tree.php:420
+#: lib/IMAP/Tree.php:2022
 msgid "Virtual Trash Folder"
 msgstr "Virtuel skraldespand"
 
-#: templates/search/search.html:193
+#: templates/search/search.html:177
 msgid "Virtual folder label:"
 msgstr "Virtuel mappe vignet:"
 
-#: lib/MIME/Viewer/pkcs7.php:379
+#: lib/MIME/Viewer/pkcs7.php:442 lib/Crypt/PGP.php:382
 msgid "Warning"
 msgstr "Advarsel"
 
-#: login.php:184 login.php:266
+#: lib/IMP.php:334
+msgid ""
+"We cannot verify that this request was really sent by you. It could be a "
+"malicious request. If you intended to perform this action, you can retry it "
+"now."
+msgstr ""
+
+#: login.php:196 login.php:355 templates/login/mobile.inc:11
 #, php-format
 msgid "Welcome to %s"
 msgstr "Velkommen til %s"
 
-#: config/prefs.php.dist:670
+#: config/prefs.php.dist:857
 msgid ""
 "What should we do with spam messages after they have been reported as spam "
 "or innocent?"
@@ -4579,7 +5302,7 @@ msgstr ""
 "Hvad skal der ske med spam-beskeder efter at de er indberettet som spam "
 "eller uskyldig?"
 
-#: config/prefs.php.dist:789
+#: config/prefs.php.dist:1007
 msgid ""
 "When deleting messages, move them to your Trash folder instead of marking "
 "them as deleted?"
@@ -4587,75 +5310,95 @@ msgstr ""
 "Når du sletter beskeder, skal de flyttes til skraldespanden i stedet for at "
 "markere dem som slettet?"
 
-#: config/prefs.php.dist:968
-msgid "When opening a new mailbox, which page do you want to start on?"
+#: config/prefs.php.dist:1191
+msgid ""
+"When opening a new mailbox for the first time, which page do you want to "
+"start on?"
 msgstr "Hvilken side ønsker du så at starte på ved åbning af en ny brevbakke?"
 
-#: config/prefs.php.dist:624
+#: config/prefs.php.dist:755
+msgid ""
+"When replying/forwarding to a message, should we use the same format as the "
+"original message?"
+msgstr ""
+"Når en besked besvares/videresendes, skal det så være i samme format som den "
+"oprindelige besked?"
+
+#: config/prefs.php.dist:719
 msgid "When saving sent-mail, should we save attachment data?"
 msgstr "Skal vedhæftelser gemmes ved lagring af afsendt e-mail?"
 
-#: config/prefs.php.dist:458
+#: config/prefs.php.dist:675
 msgid ""
 "When sending mail or expanding addresses, what domain should we append to "
 "unqualified addresses (email addresses without \"@\")?"
 msgstr ""
 "Hvilket domæne skal efterskrives ufuldstændige adresser (e-mail-adresser "
-"uden \"@\") ved afsendelse af e-mail eller udviddelse af adresser?"
+"uden \"@\") ved afsendelse af e-mail eller udvidelse af adresser?"
 
-#: config/prefs.php.dist:758
+#: config/prefs.php.dist:976
 msgid "Where do you want to display links to alternative formats of a message?"
 msgstr ""
 "Hvor ønsker du at der skal vises henvisninger til alternative formater af en "
 "besked?"
 
-#: mailbox.php:496 message.php:575
+#: config/prefs.php.dist:686
+msgid "Where should the cursor be located in the compose text area by default?"
+msgstr "Hvor skal markøren placeres i skriveområdet"
+
+#: mailbox.php:530 message.php:584
 msgid "Whitelist"
 msgstr "Positivliste"
 
-#: config/prefs.php.dist:1039 config/prefs.php.dist:1050
-#: templates/compose/compose.html:297
+#: lib/prefs.php:241 config/prefs.php.dist:602
+msgid "Xinha"
+msgstr ""
+
+#: templates/search/search.html:105
+msgid "Year"
+msgstr "År"
+
+#: templates/javascript_defs.php:43 config/prefs.php.dist:1269
+#: config/prefs.php.dist:1291 templates/compose/compose.html:302
 msgid "Yes"
 msgstr "Ja"
 
-#: lib/Maintenance/Task/fetchmail_login.php:58
+#: lib/Maintenance/Task/fetchmail_login.php:57
 msgid "You are about to fetch email from the following account(s):"
 msgstr "Du er ved at hente e-mail fra følgende konto/konti:"
 
-#: templates/folders/folders_confirm.html:10
+#: templates/folders/folders_confirm.html:11
 msgid ""
 "You are attempting to delete all messages contained in the following folder"
 "(s)."
 msgstr "Du er ved at slette alle beskeder indeholdt i følgende mappe."
 
-#: templates/folders/folders_confirm.html:9
+#: templates/folders/folders_confirm.html:10
 msgid "You are attempting to delete the following folder(s)."
 msgstr "Du er ved at slette de(n) følgende mappe(r)."
 
-#: templates/javascript/mailbox.js:34 templates/javascript/message.js:14
-#: templates/javascript/src/mailbox.js:202
-#: templates/javascript/src/message.js:77
+#: templates/javascript_defs.php:76
 msgid "You are copying/moving to a new folder."
 msgstr "Du er ved at kopiere/flytte til en ny mappe."
 
-#: templates/javascript/folders.js:17 templates/javascript/src/folders.js:102
-msgid "You are creating a sub-folder to "
-msgstr "Du er ved at oprette en undermappe til "
+#: templates/javascript_defs.php:54
+msgid "You are creating a sub-folder to"
+msgstr "Du er ved at oprette en undermappe til"
 
-#: templates/javascript/folders.js:17 templates/javascript/src/folders.js:104
+#: templates/javascript_defs.php:56
 msgid "You are creating a top-level folder."
 msgstr "Du er ved at oprette en mappe på højeste niveau."
 
-#: lib/Folder.php:281
+#: lib/Folder.php:265
 msgid "You are not allowed to create folders."
 msgstr "Du har ikke tilladelse til at danne mapper."
 
-#: lib/Folder.php:288
+#: lib/Folder.php:272
 #, php-format
 msgid "You are not allowed to create more than %d folders."
 msgstr "Du har ikke tilladelse til at danne flere end %d mapper."
 
-#: lib/Compose.php:819
+#: lib/Compose.php:985
 #, php-format
 msgid ""
 "You are not allowed to send messages to more than %d recipients within %d "
@@ -4664,18 +5407,17 @@ msgstr ""
 "Du har ikke tilladelse til at sende beskeder til flere end %d modtagere "
 "indenfor %d timer."
 
-#: lib/Compose.php:1040
+#: lib/Compose.php:1257
 #, php-format
 msgid "You are not allowed to send messages to more than %d recipients."
 msgstr ""
 "Du har ikke tilladelse til at sende beskeder til flere end %d modtagere."
 
-#: templates/javascript/folders.js:23 templates/javascript/src/folders.js:135
-msgid "You are renaming the folder: "
+#: templates/javascript_defs.php:59
+msgid "You are renaming the folder:"
 msgstr "Du er ved at omdøbe mappen: "
 
-#: templates/stationery/prefs.inc:35
-#, php-format
+#: templates/stationery/stationery.html:39
 msgid ""
 "You can use the following placeholders in the stationery text: %c for the "
 "current message content; %s for the signature."
@@ -4683,19 +5425,19 @@ msgstr ""
 "Du kan bruge disse makroer i brevpapirteksten: %c til aktuel besked, %s til "
 "signatur."
 
-#: lib/Folder.php:534
+#: lib/Folder.php:480
 #, php-format
 msgid "You cannot unsubscribe from \"%s\"."
 msgstr "Du kan ikke deaktivere \"%s\"."
 
-#: lib/Maintenance/Task/tos_agreement.php:34
+#: lib/Maintenance/Task/tos_agreement.php:33
 msgid ""
 "You did not agree to the Terms of Service agreement, so you were not allowed "
 "to login."
 msgstr ""
 "Du accepterede ikke brugsbetingelserne, hvorved du er blevet nægtet adgang."
 
-#: templates/acl/acl.html:97
+#: templates/acl/acl.html:88
 msgid "You do not have permission to change access to this folder."
 msgstr "Du har ikke tilladelse til at ændre adgang til denne mappe."
 
@@ -4704,75 +5446,84 @@ msgstr "Du har ikke tilladelse til at 
 msgid "You forwarded this message on %%s to the following recipients: %s."
 msgstr "Du videresendte denne besked den %%s til følgende modtagere: %s."
 
-#: mailbox.php:1018
+#: lib/IMP.php:1092
 #, php-format
 msgid "You have %s new messages."
 msgstr "Du har %s nye beskeder."
 
-#: mailbox.php:1018
+#: lib/IMP.php:1092
 msgid "You have 1 new message."
 msgstr "Du har 1 ny besked."
 
-#: compose.php:235
+#: lib/prefs.php:172
+msgid ""
+"You have activated move to Trash but no Trash folder is defined. You will be "
+"unable to delete messages until you set a Trash folder in the preferences."
+msgstr ""
+"Du har valge at flytte til Skrald, men der er ikke angivet nogen Skrald-"
+"mappe. Du kan ikke slette beskeder før der er angivet en Skrald-folder i "
+"Indstillingerne."
+
+#: compose.php:150
 msgid "You have already submitted this page."
 msgstr "Denne side er allerede afsendt."
 
-#: lib/IMP.php:985
-msgid "You have new mail in the following folder:"
-msgstr "Du har nye beskeder i følgende mappe:"
+#: templates/newmsg/alert.html:3
+msgid "You have new mail in:"
+msgstr "Du har ny(e) besked(er) i:"
 
-#: lib/IMP.php:990
-msgid "You have new mail in the following folders:"
-msgstr "Du har nye beskeder i følgende mapper:"
+#: templates/fetchmail/fetchmail.html:22
+msgid "You have not configured any external mail accounts."
+msgstr "Du har ikke konfigureret nogen eksterne mailkonti."
 
-#: lib/Compose.php:1022
+#: lib/Compose.php:1244
 msgid "You must enter at least one recipient."
 msgstr "Der skal angives mindst en modtager."
 
-#: lib/MIME/Viewer/pgp.php:310
+#: lib/MIME/Viewer/pgp.php:370
 msgid ""
-"You must enter the passphrase for your PGP private key to view this message"
+"You must enter the passphrase for your PGP private key to view this message."
 msgstr ""
-"Du skal angive løsenet til din private PGP-nøgle for at se denne besked"
+"Du skal angive løsenet til din private PGP-nøgle for at se denne besked."
 
-#: lib/MIME/Viewer/pkcs7.php:254
+#: lib/MIME/Viewer/pkcs7.php:316
 msgid ""
 "You must enter the passphrase for your S/MIME private key to view this "
 "message"
 msgstr ""
 "Du skal angive løsenet til din private S/MIME-nøgle for at se denne besked"
 
-#: templates/javascript/mailbox.js:34 templates/javascript/message.js:14
-#: templates/javascript/src/mailbox.js:211
-#: templates/javascript/src/message.js:86
+#: lib/MIME/Viewer/pgp.php:353
+msgid "You must enter the passphrase that was used to encrypt this message."
+msgstr "Du skal angive løsenet som blev brugt til at kryptere denne besked."
+
+#: templates/javascript_defs.php:77
 msgid "You must select a target mailbox first."
 msgstr "Vælg mailbox først, som skal anvendes."
 
-#: fetchmailprefs.php:85
+#: fetchmailprefs.php:89
 msgid "You must select an account to be deleted."
 msgstr "Du skal vælge en konto, som du vil slette."
 
-#: templates/javascript/contacts.js:15 templates/javascript/src/contacts.js:88
+#: templates/javascript_defs.php:47
 msgid "You must select an address first."
 msgstr "Du skal først vælge en adresse."
 
-#: templates/javascript/mailbox.js:19 templates/javascript/mailbox.js:34
-#: templates/javascript/mailbox.js:40 templates/javascript/src/mailbox.js:81
-#: templates/javascript/src/mailbox.js:218
-#: templates/javascript/src/mailbox.js:275
+#: templates/javascript_defs.php:40 templates/javascript_defs.php:42
 msgid "You must select at least one message first."
 msgstr "Du skal vælge mindst én besked først."
 
-#: templates/javascript/compose.js:3 templates/javascript/src/compose.js:24
+#: templates/javascript_defs.php:31
 msgid "You must specify a recipient."
 msgstr "Du skal angive en modtager."
 
-#: fetchmailprefs.php:169
-#, php-format
-msgid "You need to have \"%s\" enabled in your maintenance options."
+#: templates/fetchmail/fetchmailprefs.html:91
+msgid ""
+"You need to have \"Perform maintenance operations on login?\" enabled in "
+"your maintenance options."
 msgstr ""
-"Du bliver nødt til at have \"%s\" slået til i dine "
-"vedligeholdelsesindstillinger."
+"Du bliver nødt til at have \"Udfør vedligeholdelse ved login?\" slået til i "
+"dine vedligeholdelsesindstillinger."
 
 #: lib/Maillog.php:138
 #, php-format
@@ -4784,61 +5535,81 @@ msgstr "Du omadresserede denne besked til %s den %%s."
 msgid "You replied to this message on %s."
 msgstr "Du besvarede denne besked den %s."
 
-#: lib/Folder.php:484
+#: lib/Folder.php:432
 #, php-format
 msgid "You were not subscribed to \"%s\". Here is what the server said"
 msgstr "\"%s\" blev ikke aktiveret. Her er beskeden fra serveren"
 
-#: lib/Folder.php:536
+#: lib/Folder.php:482
 #, php-format
 msgid "You were not unsubscribed from \"%s\". Here is what the server said"
 msgstr "\"%s\" blev ikke deaktiveret. Her er beskeden fra serveren"
 
-#: lib/Folder.php:487
+#: lib/Folder.php:435
 #, php-format
 msgid "You were successfully subscribed to \"%s\""
 msgstr "\"%s\" blev aktiveret"
 
-#: lib/Folder.php:539
+#: lib/Folder.php:485
 #, php-format
 msgid "You were successfully unsubscribed from \"%s\""
 msgstr "\"%s\" blev deaktiveret"
 
-#: templates/pgp/pgp.html:89
+#: lib/Identity/imp.php:156
+msgid ""
+"Your From address is not a valid email address. This can be fixed in your "
+"Personal Information options page."
+msgstr ""
+"Din From: adresse er ikke en gyldig e-mail adresse. Det kan rettes i din "
+"Profil indstilling."
+
+#: templates/pgp/pgp.html:92
 msgid "Your Name:"
 msgstr "Dit navn:"
 
-#: templates/pgp/pgp.html:57
+#: templates/pgp/pgp.html:64
 msgid "Your PGP Public/Private Keys"
 msgstr "Dine offentlige/private PGP-nøgler"
 
-#: templates/smime/smime.html:64 templates/pgp/pgp.html:73
+#: templates/smime/smime.html:70 templates/pgp/pgp.html:79
 msgid "Your Private Key:"
 msgstr "Din private nøgle:"
 
-#: templates/smime/smime.html:60 templates/pgp/pgp.html:68
+#: templates/smime/smime.html:66 templates/pgp/pgp.html:74
 msgid "Your Public Key:"
 msgstr "Din offentlige nøgle:"
 
-#: config/prefs.php.dist:169
+#: config/prefs.php.dist:199
 msgid "Your Reply-to: address: <em>(optional)</em>"
 msgstr ""
-"e-mail-adressen, som andre sender svar til (Reply-to:) <em>(valgfri)</em>"
+"E-mail-adressen, som andre sender svar til (Reply-to:) <em>(valgfri)</em>"
 
-#: templates/smime/smime.html:50
+#: templates/smime/smime.html:56
 msgid "Your S/MIME Public/Private Certificates"
 msgstr "Dine offentlige/private S/MIME-certifikater"
 
-#: config/prefs.php.dist:177
+#: fetchmail.php:22
+msgid "Your account does not support fetching external mail."
+msgstr "Din konto understøtter ikke at hente ekstern mail."
+
+#: templates/fetchmail/fetchmailprefs.html:18
+msgid "Your accounts:"
+msgstr "Dine konti:"
+
+#: config/prefs.php.dist:207
 msgid ""
 "Your alias addresses: <em>(optional, enter each address on a new line)</em>"
 msgstr "Dine alias-adresser: <em>(valgfri, én adresse pr. linie)</em>"
 
-#: lib/MIME/Viewer/images.php:101
+#: lib/MIME/Viewer/images.php:87
 msgid "Your browser does not support inline display of this image type."
 msgstr "Din browser understøtter ikke indlejret visning af dette billedformat."
 
-#: config/prefs.php.dist:602
+#: config/prefs.php.dist:526
+msgid "Your browser does not support this feature."
+msgstr "Din browser understøtter ikke denne funktionalitet."
+
+#: config/prefs.php.dist:697
 msgid "Your default charset for sending messages:"
 msgstr "Dit normale tegnsæt til afsendelse af beskeder:"
 
@@ -4846,7 +5617,7 @@ msgstr "Dit normale tegns
 msgid "Your default encryption method for sending messages:"
 msgstr "Din normale krypteringsmetode til afsendelse af beskeder:"
 
-#: attachment.php:94
+#: attachment.php:115
 #, php-format
 msgid ""
 "Your linked attachment has been downloaded by at least one user.\n"
@@ -4857,7 +5628,7 @@ msgid ""
 "Click on the following link to permanently delete the attachment:\n"
 "%s"
 msgstr ""
-"Din henviste vedhæftelse er blevet nedtaget af mindst én bruger.\n"
+"Din henviste vedhæftelse er blevet hentet af mindst én bruger.\n"
 "\n"
 "Vedhæftelsenavn: %s\n"
 "Vedhæftelsedato: %s\n"
@@ -4865,171 +5636,179 @@ msgstr ""
 "Klik på følgende henvisning for at slette vedhæftelsen permanent:\n"
 "%s"
 
-#: lib/MIME/Viewer/status.php:89
+#: lib/MIME/Viewer/status.php:88
 msgid "Your message was successfully delivered."
 msgstr "Din besked er afleveret."
 
-#: config/prefs.php.dist:210
+#: config/prefs.php.dist:231
 msgid "Your signature:"
 msgstr "Din signatur:"
 
-#: templates/javascript/addressesBlocks.js:3
-#: templates/javascript/src/addressesBlocks.js:18
+#: lib/Message.php:535
+#, php-format
+msgid "[Attachment stripped: Original attachment type: %s, name: %s]"
+msgstr "[Vedhæftelsen taget af: Oprindelig type: %s, navn: %s]"
+
+#: templates/javascript/addressesBlocks.js:7 lib/MIME/Headers.php:264
 msgid "[Hide Addresses]"
 msgstr "[Skjul adresser]"
 
-#: mailbox.php:693 message.php:253 lib/Compose.php:1466 lib/Compose.php:1962
+#: mailbox.php:719 message.php:285 rss.php:75 lib/Compose.php:1891
+#: lib/Compose.php:2369
 msgid "[No Subject]"
 msgstr "[Intet emne]"
 
-#: lib/MIME/Viewer/pgp.php:169
+#: lib/MIME/Viewer/pgp.php:170
 msgid "[Save the key to your Address book]"
 msgstr "[Gem nøglen i dit adressekartotek]"
 
-#: templates/javascript/addressesBlocks.js:3
-#: templates/javascript/src/addressesBlocks.js:19
+#: templates/javascript/addressesBlocks.js:8
 msgid "[Show Addresses -"
 msgstr "[Vis adresser -"
 
-#: lib/MIME/Headers.php:222
+#: lib/MIME/Headers.php:263
 #, php-format
-msgid "[Show addresses - %s recipients]"
-msgstr "[Vis adresser - %s modtagere]"
+msgid "[Show Addresses - %d recipients]"
+msgstr "[Vis adresser - %d modtagere]"
+
+#: lib/Compose.php:3015
+msgid "[Truncated Text]"
+msgstr "[Trunkeret tekst]"
 
-#: lib/MIME/Viewer/pgp.php:171
+#: lib/MIME/Viewer/pgp.php:172
 msgid "[View the raw key]"
 msgstr "[Se den rå nøgle]"
 
-#: compose.php:1127
+#: compose.php:966
 msgid "_Bcc"
 msgstr "Bcc"
 
-#: mailbox.php:490 message.php:569
+#: mailbox.php:526 message.php:580
 msgid "_Blacklist"
 msgstr "Blackliste"
 
-#: compose.php:1124
+#: compose.php:963
 msgid "_Cc"
 msgstr "Cc"
 
-#: mailbox.php:463 mailbox.php:466 message.php:541
+#: mailbox.php:508 mailbox.php:510 message.php:554
 msgid "_Delete"
 msgstr "Slet"
 
-#: lib/IMP.php:818
+#: lib/IMP.php:865
 msgid "_Folders"
 msgstr "Mapper"
 
-#: compose.php:1104
+#: compose.php:943
 msgid "_Identity"
 msgstr "Profil"
 
-#: lib/IMP.php:783
+#: lib/IMP.php:834
 msgid "_Inbox"
 msgstr "Indbakke"
 
-#: lib/IMP.php:859
+#: lib/IMP.php:902
 msgid "_Log out"
 msgstr "Log ud"
 
-#: message.php:582
+#: message.php:589
 msgid "_Message Source"
 msgstr "Kildetekst"
 
-#: lib/IMP.php:815
+#: lib/IMP.php:862
 msgid "_New Message"
-msgstr "Nye besked"
+msgstr "_Ny besked"
 
-#: message.php:598
+#: message.php:603
 msgid "_Print"
 msgstr "Udskriv"
 
-#: compose.php:1195
+#: compose.php:1035
 msgid "_Priority"
-msgstr "Prioritet"
+msgstr "_Prioritet"
 
-#: mailbox.php:326
+#: mailbox.php:353
 #, php-format
 msgid "_Refresh %s"
-msgstr "Genopfrisk %s"
+msgstr "_Genopfrisk %s"
 
-#: message.php:544
+#: message.php:557
 msgid "_Reply"
-msgstr "Svar"
+msgstr "_Svar"
 
-#: lib/IMP.php:820
+#: lib/IMP.php:867
 msgid "_Search"
 msgstr "Søg"
 
-#: compose.php:1089
+#: compose.php:928
 msgid "_Send Message"
 msgstr "Afsend besked"
 
-#: mailbox.php:580
+#: mailbox.php:597
 msgid "_Thread"
 msgstr "Tråd"
 
-#: compose.php:1120 compose.php:1122
+#: compose.php:959 compose.php:961
 msgid "_To"
 msgstr "Til"
 
-#: mailbox.php:471
+#: mailbox.php:514
 msgid "_Undelete"
 msgstr "Fortryd sletning"
 
-#: message.php:563
+#: message.php:576
 msgid "_View Thread"
 msgstr "Se tråd"
 
-#: mailbox.php:496 message.php:575
+#: mailbox.php:530 message.php:584
 msgid "_Whitelist"
 msgstr "Positivliste"
 
-#: lib/Compose.php:846
+#: lib/Compose.php:1012
 msgid "addressee unknown"
 msgstr "adressent ukendt"
 
-#: lib/Search.php:506
+#: lib/Search.php:595
 msgid "and"
 msgstr "og"
 
-#: lib/Compose.php:1574
+#: lib/Compose.php:2002
 msgid "attachment"
 msgstr "vedhæftelse"
 
-#: view.php:117
+#: view.php:122
 msgid "attachments.zip"
 msgstr "vedhæftelser.zip"
 
-#: templates/compose/compose.html:278
+#: templates/compose/compose.html:283
 msgid "bytes"
-msgstr "okteter"
+msgstr "oktetter"
 
-#: lib/Compose.php:870
+#: lib/Compose.php:1036
 msgid "cannot create output file"
 msgstr "kan ikke danne uddata-fil"
 
-#: lib/Compose.php:842
+#: lib/Compose.php:1008
 msgid "cannot open input"
 msgstr "kan ikke åbne inddata"
 
-#: lib/Compose.php:834
+#: lib/Compose.php:1000
 msgid "command line usage error"
 msgstr "fejl ved anvendelse af kommando-linie"
 
-#: lib/Compose.php:890
+#: lib/Compose.php:1056
 msgid "configuration error"
 msgstr "konfigurationsfejl"
 
-#: lib/Compose.php:866
+#: lib/Compose.php:1032
 msgid "critical system file missing"
 msgstr "mangler kritisk systemfil"
 
-#: lib/Compose.php:838
+#: lib/Compose.php:1004
 msgid "data format error"
 msgstr "fejl i dataformat"
 
-#: lib/Compose.php:894
+#: lib/Compose.php:1060
 msgid "entry not found"
 msgstr "indgang ikke fundet"
 
@@ -5037,87 +5816,74 @@ msgstr "indgang ikke fundet"
 msgid "from"
 msgstr "fra"
 
-#: lib/Compose.php:850
+#: lib/Compose.php:1016
 msgid "host name unknown"
 msgstr "ukendt maskinnavn"
 
-#: lib/Search.php:508 templates/compose/spelling.html:31
+#: lib/Search.php:598
 msgid "in"
 msgstr "i"
 
-#: lib/Compose.php:874
+#: lib/Compose.php:1040
 msgid "input/output error"
 msgstr "inddata/uddata-fejl"
 
-#: lib/Compose.php:858
+#: lib/Compose.php:1024
 msgid "internal software error"
 msgstr "intern software-fejl"
 
-#: templates/folders/import.html:13
+#: templates/folders/import.html:14
 msgid "into folder"
 msgstr "ind i mappe"
 
-#: pgp.php:76 smime.php:37
+#: pgp.php:84 smime.php:39
 msgid "key"
 msgstr "nøgle"
 
-#: folders.php:109
+#: folders.php:143
 msgid "mailbox file"
 msgstr "brevbakke-fil"
 
-#: lib/Compose.php:635 lib/Message.php:541
+#: lib/Compose.php:816
 msgid "name"
 msgstr "navn"
 
-#: templates/compose/spelling.html:32
-msgid "none"
-msgstr "ingen"
-
-#: lib/Search.php:504
+#: lib/Search.php:590
 msgid "not"
 msgstr "ikke"
 
-#: lib/Search.php:506 templates/compose/spelling.html:50
+#: lib/Search.php:595 templates/fetchmail/fetchmailprefs.html:26
 msgid "or"
 msgstr "eller"
 
-#: lib/Compose.php:886
+#: lib/Compose.php:1052
 msgid "permission denied"
 msgstr "tilladelse nægtet"
 
-#: templates/javascript/addressesBlocks.js:3
-#: templates/javascript/src/addressesBlocks.js:19
+#: templates/javascript/addressesBlocks.js:8
 msgid "recipients]"
 msgstr "modtagere]"
 
-#: lib/Compose.php:882
+#: lib/Compose.php:1048
 msgid "remote error in protocol"
 msgstr "fejl i protokol fra fjern side"
 
-#: lib/Compose.php:854
+#: lib/Compose.php:1020
 msgid "service unavailable"
 msgstr "tjeneste utilgængelig"
 
-#: templates/compose/spelling.html:19
-msgid "spelling error"
-msgstr "stavefejl"
-
-#: templates/compose/spelling.html:19
-msgid "spelling errors"
-msgstr "stavefejl"
-
-#: lib/Compose.php:862
+#: lib/Compose.php:1028
 msgid "system error"
 msgstr "systemfejl"
 
-#: lib/Compose.php:878
+#: lib/Compose.php:1044
 msgid "temporary failure"
 msgstr "midlertidig fejltilstand"
 
-#: lib/Filter.php:79
+#: lib/Filter.php:65
 msgid "your blacklist"
 msgstr "din negativliste"
 
-#: lib/Filter.php:89
+#: lib/Filter.php:91
 msgid "your whitelist"
 msgstr "din positivliste"
diff --git a/po/de_DE.po b/po/de_DE.po
index 9e10daf..17b949b 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: IMP 4.2-cvs\n"
 "Report-Msgid-Bugs-To: dev at lists.horde.org\n"
-"POT-Creation-Date: 2009-03-19 11:55+0100\n"
+"POT-Creation-Date: 2009-09-12 10:09+0200\n"
 "PO-Revision-Date: 2009-03-19 11:58+0100\n"
 "Last-Translator: Jan Schneider <jan at horde.org>\n"
 "Language-Team: German <dev at lists.horde.org>\n"
@@ -20,28 +20,28 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: lib/Compose.php:1980
+#: lib/Compose.php:1984
 msgid "      Cc: "
 msgstr "        Cc: "
 
-#: lib/Compose.php:1977
+#: lib/Compose.php:1981
 msgid "      To: "
 msgstr "        An: "
 
-#: lib/Compose.php:1965
+#: lib/Compose.php:1969
 msgid "    Date: "
 msgstr "     Datum: "
 
-#: lib/Compose.php:1968
+#: lib/Compose.php:1972
 msgid "    From: "
 msgstr "       Von: "
 
-#: folders.php:359 mailbox.php:357
+#: folders.php:370 mailbox.php:357
 #, php-format
 msgid " (Accesskey %s)"
 msgstr " (Zugriffstaste %s)"
 
-#: lib/Compose.php:1974
+#: lib/Compose.php:1978
 msgid " Subject: "
 msgstr "   Betreff: "
 
@@ -59,12 +59,12 @@ msgstr "%.0f MB"
 msgid "%.0f%% of %.0f MB"
 msgstr "%.0f%% von %.0f MB"
 
-#: folders.php:300 folders.php:311 lib/Message.php:863
+#: folders.php:311 folders.php:322 lib/Message.php:863
 #, php-format
 msgid "%.2fMB"
 msgstr "%.2fMB"
 
-#: thread.php:158
+#: thread.php:162
 #, php-format
 msgid "%d Messages"
 msgstr "%d Nachrichten"
@@ -207,7 +207,7 @@ msgstr "%s m
 msgid "%s wishes to receive the latest information about \"%s\"."
 msgstr "%s möchte die neuesten Informationen über \"%s\" erhalten."
 
-#: compose.php:1229
+#: compose.php:1233
 #, php-format
 msgid "%s%% of allowed size"
 msgstr "%s%% der erlaubten Größe"
@@ -217,7 +217,7 @@ msgstr "%s%% der erlaubten Gr
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: lib/Compose.php:1909
+#: lib/Compose.php:1913
 #, php-format
 msgid "%u Forwarded Messages"
 msgstr "%u weitergeleitete Nachrichten"
@@ -350,7 +350,7 @@ msgstr "Zu meiner Aufgabenliste hinzuf
 msgid "Add to my calendar"
 msgstr "Zu meinem Kalender hinzufügen"
 
-#: lib/Compose.php:2954
+#: lib/Compose.php:2958
 #, php-format
 msgid "Added \"%s\" as an attachment."
 msgstr "\"%s\" als Anhang hinzugefügt."
@@ -390,7 +390,7 @@ msgstr "Zus
 msgid "Additional message error details can be viewed %s."
 msgstr "Zusätzliche Fehlerdetails können %s angeschaut werden."
 
-#: compose.php:825 compose.php:1071 contacts.php:120
+#: compose.php:826 compose.php:1072 contacts.php:120
 #: templates/contacts/contacts.html:8
 msgid "Address Book"
 msgstr "Adressbuch"
@@ -551,7 +551,7 @@ msgid "Apply filter rules whenever sidebar is refreshed?"
 msgstr ""
 "Filterregeln immer anwenden, wenn das seitliche Menü aktualisiert wird?"
 
-#: thread.php:170
+#: thread.php:174
 msgid "Are you sure you want to delete all messages in this thread?"
 msgstr ""
 "Sind Sie sicher, dass Sie alle Nachrichten zu diesem Thema löschen möchten?"
@@ -628,15 +628,15 @@ msgstr "Aufsteigend"
 msgid "Ask"
 msgstr "Nachfragen"
 
-#: compose.php:1167
+#: compose.php:1171
 msgid "Attach Files"
 msgstr "Dateien anhängen"
 
-#: compose.php:1156
+#: compose.php:1160
 msgid "Attach a copy of your PGP public key to the message?"
 msgstr "Ihren öffentlichen PGP-Schlüssels an die Nachricht anhängen?"
 
-#: compose.php:1161
+#: compose.php:1165
 msgid "Attach your contact information to the message?"
 msgstr "Ihre Visitenkarte an die Nachricht anhängen?"
 
@@ -644,7 +644,7 @@ msgstr "Ihre Visitenkarte an die Nachricht anh
 msgid "Attached File:"
 msgstr "Angehängte Datei:"
 
-#: lib/Compose.php:2013 lib/Compose.php:2119
+#: lib/Compose.php:2017 lib/Compose.php:2123
 #, php-format
 msgid ""
 "Attached file \"%s\" exceeds the attachment size limits. File NOT attached."
@@ -668,7 +668,7 @@ msgstr "Anhang"
 msgid "Attachment %s deleted."
 msgstr "Anlage %s wurde gelöscht."
 
-#: lib/Compose.php:2642
+#: lib/Compose.php:2646
 msgid "Attachment Information"
 msgstr "Anhangsinformationen"
 
@@ -676,7 +676,7 @@ msgstr "Anhangsinformationen"
 msgid "Attachment stripped: Original attachment type"
 msgstr "Anhang entfernt: Ehemaliger Anhangstyp"
 
-#: compose.php:1105 lib/Compose.php:2609 templates/compose/compose.html:252
+#: compose.php:1105 lib/Compose.php:2613 templates/compose/compose.html:252
 msgid "Attachments"
 msgstr "Anhänge"
 
@@ -692,7 +692,7 @@ msgstr "Achtung"
 msgid "Auth_imp: Required IMAP extension not found."
 msgstr "Auth_imp: Die benötigte IMAP-Erweiterung wurde nicht gefunden."
 
-#: config/hooks.php.dist:538
+#: config/hooks.php.dist:579
 msgid "Authentication failed."
 msgstr "Anmeldung fehlgeschlagen."
 
@@ -712,21 +712,21 @@ msgstr "Verf
 msgid "Awaiting Response"
 msgstr "Auf Antwort wartend"
 
-#: message.php:524 thread.php:137
+#: message.php:524 thread.php:141
 #, php-format
 msgid "Bac_k to %s"
 msgstr "_Zurück zu %s"
 
-#: message.php:524 thread.php:137
+#: message.php:524 thread.php:141
 #, php-format
 msgid "Back to %s"
 msgstr "Zurück zu %s"
 
-#: thread.php:134
+#: thread.php:138
 msgid "Back to Multiple Message View Index"
 msgstr "Zurück zum Nachrichtenindex"
 
-#: thread.php:132
+#: thread.php:136
 msgid "Back to Thread Display"
 msgstr "Zurück zur Themenliste"
 
@@ -734,7 +734,7 @@ msgstr "Zur
 msgid "Background Color"
 msgstr "Hintergrundfarbe"
 
-#: lib/IMAP/Client.php:478
+#: lib/IMAP/Client.php:480
 #, php-format
 msgid "Bad login name or password."
 msgstr "Falscher Benutzername oder Passwort."
@@ -744,7 +744,7 @@ msgstr "Falscher Benutzername oder Passwort."
 msgid "Bad or malformed request. Server Responded: %s"
 msgstr "Ungültige oder fehlerhafte Anfrage. Serverantwort: %s"
 
-#: lib/IMAP/Client.php:482
+#: lib/IMAP/Client.php:484
 #, php-format
 msgid "Bad request: %s"
 msgstr "Ungültige Anfrage: %s"
@@ -805,18 +805,18 @@ msgstr "Unten"
 msgid "Bulleted List"
 msgstr "Unnummerierte Liste"
 
-#: lib/IMAP/Client.php:407
+#: lib/IMAP/Client.php:409
 msgid ""
 "CRAM-MD5 or DIGEST-MD5 requires PEAR's Auth_SASL package to be installed."
 msgstr ""
 "Für CRAM-MD5 oder DIGEST-MD5 muss das Auth_SASL-Paket von PEAR installiert "
 "sein."
 
-#: compose.php:1025
+#: compose.php:1026
 msgid "C_harset"
 msgstr "_Zeichensatz"
 
-#: search.php:279 config/hooks.php.dist:465
+#: search.php:279 config/hooks.php.dist:506
 msgid "Calendar"
 msgstr "Kalender"
 
@@ -845,7 +845,7 @@ msgstr "Verbindung zum E-Mail-Server kann nicht hergestellt werden."
 msgid "Cannot connect to the remote mail server: "
 msgstr "Verbindung zum E-Mail-Server kann nicht hergestellt werden: "
 
-#: lib/IMAP/Tree.php:2092
+#: lib/IMAP/Tree.php:2093
 msgid "Cannot directly create mailbox in this folder."
 msgstr "In diesem Order kann kein direkter Unterordner angelegt werden."
 
@@ -921,7 +921,7 @@ msgstr "Alle/Keine ausw
 msgid "Check Spelling"
 msgstr "Rechtschreibprüfung"
 
-#: folders.php:372 mailbox.php:656
+#: folders.php:383 mailbox.php:656
 msgid "Check _All/None"
 msgstr "_Alle/Keine auswählen"
 
@@ -991,7 +991,7 @@ msgstr "Klicken Sie %s, um das Bild herunterzuladen."
 msgid "Click %s to go to %s management page."
 msgstr "Klicken Sie %s, um zu %s-Verwaltung zu gelangen."
 
-#: lib/MIME/Viewer/pkcs7.php:484
+#: lib/MIME/Viewer/pkcs7.php:487
 #, php-format
 msgid "Click %s to view the attachment in a separate window."
 msgstr "Klicken Sie %s, um den Anhang in einem neuen Fenster anzuzeigen."
@@ -1039,23 +1039,23 @@ msgstr "Schlie
 msgid "Close this window"
 msgstr "Dieses Fenster schließen"
 
-#: lib/IMAP/Tree.php:2037
+#: lib/IMAP/Tree.php:2038
 msgid "Closed Folder"
 msgstr "Geschlossener Ordner"
 
-#: folders.php:453
+#: folders.php:464
 msgid "Collapse"
 msgstr "Schließen"
 
-#: folders.php:388
+#: folders.php:399
 msgid "Collapse All"
 msgstr "Alle s_chließen"
 
-#: folders.php:388
+#: folders.php:399
 msgid "Collapse All Folders"
 msgstr "Alle Ordner schließen"
 
-#: folders.php:453
+#: folders.php:464
 msgid "Collapse Folder"
 msgstr "Ordner schließen"
 
@@ -1095,11 +1095,11 @@ msgstr "Legen Sie fest, wie Nachrichten angezeigt werden."
 msgid "Configure mail preview options."
 msgstr "Ändern Sie die Einstellungen für die Nachrichtenvorschau."
 
-#: config/hooks.php.dist:534
+#: config/hooks.php.dist:575
 msgid "Connection to server failed."
 msgstr "Verbindung zum Server fehlgeschlagen."
 
-#: config/hooks.php.dist:489
+#: config/hooks.php.dist:530
 msgid "Contacts"
 msgstr "Kontakte"
 
@@ -1137,7 +1137,7 @@ msgstr "Auswahl kopieren"
 msgid "Copy to folder"
 msgstr "Kopieren nach"
 
-#: lib/Compose.php:2094
+#: lib/Compose.php:2098
 #, php-format
 msgid "Could not attach %s to the message."
 msgstr "%s konnte nicht an die Nachricht angehängt werden."
@@ -1157,7 +1157,7 @@ msgstr "Das VFS-Backend konnte nicht aufgerufen werden: %s"
 msgid "Could not delete messages from %s. The server said: %s"
 msgstr "Nachrichten konnten nicht aus %s gelöscht werden: %s"
 
-#: lib/Session.php:330
+#: lib/Session.php:333
 msgid "Could not execute maintenance operations."
 msgstr "Die Wartungsaufgaben konnten nicht durchgeführt werden."
 
@@ -1178,11 +1178,11 @@ msgstr ""
 "Die Nachrichten können nicht in den Spamordner verschoben werden - es wurde "
 "in den Einstellungen kein Spamordner angebeben."
 
-#: lib/IMAP/Client.php:318
+#: lib/IMAP/Client.php:320
 msgid "Could not open secure connection to the IMAP server."
 msgstr "Sichere Verbindung zum IMAP-Server kann nicht hergestellt werden."
 
-#: lib/Session.php:286
+#: lib/Session.php:284
 msgid "Could not retrieve namespace information from IMAP server."
 msgstr ""
 "Die Namespace-Informationen konnten nicht vom IMAP-Server ausgelesen werden."
@@ -1365,7 +1365,7 @@ msgstr "Standardsortierrichtung:"
 msgid "Delegated"
 msgstr "Delegiert"
 
-#: folders.php:418 message.php:554 mailbox.php:508 mailbox.php:510
+#: folders.php:429 message.php:554 mailbox.php:508 mailbox.php:510
 #: lib/IMAP/ACL/rfc4314.php:57 templates/fetchmail/fetchmailprefs.html:122
 #: templates/contacts/contacts.html:59 templates/folders/actions.html:19
 #: templates/smime/smime.html:35 templates/pgp/pgp.html:43
@@ -1393,11 +1393,11 @@ msgstr "Ausgew
 msgid "Delete Stationery"
 msgstr "Vorlage löschen"
 
-#: thread.php:170
+#: thread.php:174
 msgid "Delete Thread"
 msgstr "Thema löschen"
 
-#: folders.php:418
+#: folders.php:429
 msgid "Delete Virtual Folder"
 msgstr "Virtuellen Ordner löschen"
 
@@ -1478,19 +1478,19 @@ msgstr "Beschreibung:"
 msgid "Details"
 msgstr "Details"
 
-#: lib/Compose.php:2936
+#: lib/Compose.php:2940
 #, php-format
 msgid "Did not attach \"%s\" as it was only partially uploaded."
 msgstr ""
 "\"%s\" wurde nicht angehängt, weil die Datei nicht vollständig hochgeladen "
 "wurde."
 
-#: lib/Compose.php:2945
+#: lib/Compose.php:2949
 #, php-format
 msgid "Did not attach \"%s\" as the file was empty."
 msgstr "\"%s\" wurde nicht angehängt, weil die Datei leer war."
 
-#: lib/Compose.php:2932
+#: lib/Compose.php:2936
 #, php-format
 msgid ""
 "Did not attach \"%s\" as the maximum allowed upload size has been exceeded."
@@ -1498,7 +1498,7 @@ msgstr ""
 "\"%s\" wurde nicht angehängt, weil die maximal erlaubte Größe überschritten "
 "wurde."
 
-#: lib/Compose.php:2940
+#: lib/Compose.php:2944
 #, php-format
 msgid ""
 "Did not attach \"%s\" as the server configuration did not allow the file to "
@@ -1593,7 +1593,7 @@ msgstr "Als ZIP-Datei herunterladen"
 msgid "Draft"
 msgstr "Entwurf"
 
-#: lib/IMAP/Tree.php:1992
+#: lib/IMAP/Tree.php:1993
 msgid "Draft folder"
 msgstr "Entwürfe-Ordner"
 
@@ -1621,7 +1621,7 @@ msgstr "ENDE"
 msgid "ERROR: Your message could not be delivered."
 msgstr "FEHLER: Ihre Nachricht konnte nicht verschickt werden."
 
-#: folders.php:419 templates/stationery/stationery.html:19
+#: folders.php:430 templates/stationery/stationery.html:19
 msgid "Edit"
 msgstr "Bearbeiten"
 
@@ -1629,7 +1629,7 @@ msgstr "Bearbeiten"
 msgid "Edit Search Query"
 msgstr "Suchanfrage bearbeiten"
 
-#: folders.php:419 templates/search/search.html:17
+#: folders.php:430 templates/search/search.html:17
 msgid "Edit Virtual Folder"
 msgstr "Virtuellen Ordner bearbeiten"
 
@@ -1695,16 +1695,11 @@ msgstr "S/MIME-Funktionen aktivieren?"
 msgid "Enable message previews?"
 msgstr "Nachrichtenvorschau aktivieren?"
 
-#: compose.php:1150
+#: compose.php:1153
 msgid "Encr_yption Options"
 msgstr "_Verschlüsselungs-Einstellungen"
 
-#: lib/MIME/Viewer/itip.php:608 lib/MIME/Viewer/itip.php:610
-#: lib/MIME/Viewer/itip.php:784 lib/MIME/Viewer/itip.php:786
-msgid "End"
-msgstr "Ende"
-
-#: lib/Compose.php:1813
+#: lib/Compose.php:1815
 msgid "End forwarded message"
 msgstr "Ende der weitergeleiteten Nachricht"
 
@@ -1717,6 +1712,11 @@ msgstr "Ende der Nachricht"
 msgid "End message from %s"
 msgstr "Ende der Nachricht von %s"
 
+#: lib/MIME/Viewer/itip.php:608 lib/MIME/Viewer/itip.php:610
+#: lib/MIME/Viewer/itip.php:784 lib/MIME/Viewer/itip.php:786
+msgid "End:"
+msgstr "Ende:"
+
 #: smime.php:346 pgp.php:447
 msgid "Enter Passphrase"
 msgstr "Passwort eingeben"
@@ -1748,12 +1748,12 @@ msgstr "Gesamte Nachricht"
 msgid "Entry \"%s\" was successfully added to the address book"
 msgstr "Der Eintrag \"%s\" wurde erfolgreich dem Adressbuch hinzugefügt"
 
-#: lib/MIME/Viewer/pkcs7.php:441 lib/MIME/Viewer/pgp.php:448
+#: lib/MIME/Viewer/pkcs7.php:444 lib/MIME/Viewer/pgp.php:453
 #: lib/MIME/Viewer/status.php:71 lib/MIME/Viewer/status.php:162
 msgid "Error"
 msgstr "Fehler"
 
-#: lib/IMAP/Client.php:303 lib/IMAP/Client.php:323
+#: lib/IMAP/Client.php:305 lib/IMAP/Client.php:325
 #, php-format
 msgid "Error connecting to IMAP server: [%s] %s."
 msgstr "Verbindung zum IMAP-Server kann nicht hergestellt werden. [%s] %s."
@@ -1795,23 +1795,23 @@ msgstr "Alle halbe Stunde"
 msgid "Every minute"
 msgstr "Alle 60 Sekunden"
 
-#: folders.php:464
+#: folders.php:475
 msgid "Expand"
 msgstr "Vergrößern"
 
-#: folders.php:387
+#: folders.php:398
 msgid "Expand All"
 msgstr "Alle ö_ffnen"
 
-#: folders.php:387
+#: folders.php:398
 msgid "Expand All Folders"
 msgstr "Alle Ordner öffnen"
 
-#: folders.php:464
+#: folders.php:475
 msgid "Expand Folder"
 msgstr "Ordner öffnen"
 
-#: compose.php:827 compose.php:1079
+#: compose.php:828 compose.php:1080
 msgid "Expand Names"
 msgstr "Namen suchen"
 
@@ -1920,20 +1920,20 @@ msgstr "Markierte Nachrichten"
 msgid "Fo_rward"
 msgstr "_Weiterleiten"
 
-#: lib/IMAP/Tree.php:2037 templates/folders/folders_size.html:6
+#: lib/IMAP/Tree.php:2038 templates/folders/folders_size.html:6
 msgid "Folder"
 msgstr "Ordner"
 
-#: folders.php:262 templates/folders/folders_confirm.html:6
+#: folders.php:273 templates/folders/folders_confirm.html:6
 msgid "Folder Actions - Confirmation"
 msgstr "Ordneraktionen - Bestätigung"
 
-#: folders.php:325 templates/prefs/initialpageselect.inc:11
+#: folders.php:336 templates/prefs/initialpageselect.inc:11
 #: templates/folders/head.html:2
 msgid "Folder Navigator"
 msgstr "Ordner Navigation"
 
-#: folders.php:282 templates/folders/folders_size.html:1
+#: folders.php:293 templates/folders/folders_size.html:1
 msgid "Folder Sizes"
 msgstr "Ordnergrößen"
 
@@ -1957,23 +1957,23 @@ msgstr "Schriftfarbe"
 msgid "Format of message dates in the mailbox view for messages dated today"
 msgstr "Datumsformat für Nachrichten von heute in der Ordneransicht"
 
-#: message.php:568 mailbox.php:533 lib/Compose.php:1796
+#: message.php:568 mailbox.php:533 lib/Compose.php:1798
 msgid "Forward"
 msgstr "Weiterleiten"
 
-#: lib/Compose.php:1782
+#: lib/Compose.php:1784
 msgid "Forward:"
 msgstr "Weiterleiten:"
 
-#: lib/Compose.php:1895
+#: lib/Compose.php:1899
 msgid "Forwarded Message:"
 msgstr "Weitergeleitete Nachricht:"
 
-#: lib/Compose.php:1809
+#: lib/Compose.php:1811
 msgid "Forwarded message"
 msgstr "Weitergeleitete Nachricht"
 
-#: lib/Compose.php:1807
+#: lib/Compose.php:1809
 #, php-format
 msgid "Forwarded message from %s"
 msgstr "Weitergeleitete Nachricht von %s"
@@ -2012,12 +2012,12 @@ msgstr "Allgemeine Einstellungen"
 msgid "Get only new messages? (IMAP only)"
 msgstr "Nur neue Nachrichten abrufen? (nur IMAP)"
 
-#: folders.php:374 lib/MIME/Viewer/itip.php:650 lib/MIME/Viewer/itip.php:860
+#: folders.php:385 lib/MIME/Viewer/itip.php:650 lib/MIME/Viewer/itip.php:860
 #: lib/MIME/Viewer/itip.php:991
 msgid "Go"
 msgstr "Los"
 
-#: thread.php:136
+#: thread.php:140
 msgid "Go to Message"
 msgstr "Zu dieser Nachricht"
 
@@ -2034,7 +2034,7 @@ msgstr "Zum Adressbucheintrag von \"%s\""
 #: lib/MIME/Viewer/images.php:90 lib/MIME/Viewer/images.php:97
 #: lib/MIME/Viewer/images.php:99 lib/MIME/Viewer/notification.php:60
 #: lib/MIME/Viewer/notification.php:67 lib/MIME/Viewer/related.php:85
-#: lib/MIME/Viewer/pkcs7.php:484 lib/MIME/Viewer/appledouble.php:48
+#: lib/MIME/Viewer/pkcs7.php:487 lib/MIME/Viewer/appledouble.php:48
 #: lib/MIME/Viewer/status.php:119 lib/MIME/Viewer/status.php:128
 msgid "HERE"
 msgstr "HIER"
@@ -2079,11 +2079,11 @@ msgstr "Versteckt in der Themenansicht und in Mailinglisten-Nachrichten"
 msgid "Hide Deleted"
 msgstr "Verstecke gelöschte"
 
-#: folders.php:380
+#: folders.php:391
 msgid "Hide Unsubscribed"
 msgstr "_Ausgeblendete Ordner verstecken"
 
-#: compose.php:1041
+#: compose.php:1042
 msgid "High"
 msgstr "Hoch"
 
@@ -2091,7 +2091,7 @@ msgstr "Hoch"
 msgid "High Priority"
 msgstr "Hohe Priorität"
 
-#: compose.php:1040
+#: compose.php:1041
 msgid "Highest"
 msgstr "Höchste"
 
@@ -2144,7 +2144,7 @@ msgstr "IMAP ohne TLS"
 msgid "IMAP/POP3 Mail Servers"
 msgstr "IMAP/POP3 E-Mail-Server"
 
-#: lib/IMAP/Client.php:283
+#: lib/IMAP/Client.php:285
 msgid "If using SSL or TLS, you must have the PHP openssl extension loaded."
 msgstr ""
 "Um SSL oder TLS benutzen zu können, muss die OpenSSL-Erweiterung für PHP "
@@ -2251,7 +2251,7 @@ msgstr "In Bearbeitung"
 
 #: templates/prefs/initialpageselect.inc:4 lib/Folder.php:68 lib/api.php:293
 #: lib/IMP.php:732 lib/IMP.php:742 lib/IMAP/Tree.php:410
-#: lib/IMAP/Tree.php:1975
+#: lib/IMAP/Tree.php:1976
 msgid "Inbox"
 msgstr "Posteingang"
 
@@ -2435,15 +2435,15 @@ msgstr "Letzte Ordnerseite"
 msgid "Last Page"
 msgstr "Letzte Seite"
 
-#: compose.php:1193
+#: compose.php:1197
 msgid "Link Attachments?"
 msgstr "Anhänge verlinken?"
 
-#: attachment.php:35 lib/Compose.php:2600
+#: attachment.php:35 lib/Compose.php:2604
 msgid "Linked attachments are forbidden."
 msgstr "Verlinkte Anhänge sind deaktiviert."
 
-#: lib/Compose.php:2616
+#: lib/Compose.php:2620
 #, php-format
 msgid "Links will expire on %s"
 msgstr "Die Links sind bis zum %s gültig"
@@ -2464,7 +2464,7 @@ msgstr ""
 msgid "Listing in the Header"
 msgstr "Als Liste im Nachrichtenkopf"
 
-#: compose.php:812
+#: compose.php:813
 msgid "Loading..."
 msgstr "Lade..."
 
@@ -2493,7 +2493,7 @@ msgstr "Anmelden"
 msgid "Login Tasks"
 msgstr "Anmeldeaufgaben"
 
-#: compose.php:1043
+#: compose.php:1044
 msgid "Low"
 msgstr "Niedrig"
 
@@ -2501,7 +2501,7 @@ msgstr "Niedrig"
 msgid "Low Priority"
 msgstr "Niedrige Priorität"
 
-#: compose.php:1044
+#: compose.php:1045
 msgid "Lowest"
 msgstr "Niedrigste"
 
@@ -2517,7 +2517,7 @@ msgstr "Nachrichtenvorschau"
 msgid "Mail server type to connect to:"
 msgstr "Typ des E-Mail-Servers, mit dem Sie sich verbinden wollen:"
 
-#: lib/IMAP/Tree.php:1982 lib/IMAP/Tree.php:2009
+#: lib/IMAP/Tree.php:1983 lib/IMAP/Tree.php:2010
 msgid "Mailbox"
 msgstr "Ordner"
 
@@ -2723,7 +2723,7 @@ msgstr "Nach oben"
 msgid "Multipart/alternative"
 msgstr "Multipart/alternative"
 
-#: thread.php:177
+#: thread.php:181
 msgid "Multiple Message View"
 msgstr "Ansicht für mehrere Nachrichten"
 
@@ -2791,7 +2791,7 @@ msgstr "Nein"
 msgid "No Certificate found"
 msgstr "Kein Zertifikat gefunden"
 
-#: lib/IMP.php:1447
+#: lib/IMP.php:1449
 msgid "No Encryption"
 msgstr "Keine Verschlüsselung"
 
@@ -2836,7 +2836,7 @@ msgstr "Kein Ordner ausgew
 msgid "No folders are being checked for new mail."
 msgstr "Es werden keine Ordner auf neue Nachrichten überprüft."
 
-#: folders.php:199 lib/Folder.php:423 lib/Folder.php:471
+#: folders.php:210 lib/Folder.php:423 lib/Folder.php:471
 msgid "No folders were specified"
 msgstr "Kein Ordner angegeben"
 
@@ -2856,7 +2856,7 @@ msgstr "Keine Begrenzung"
 msgid "No message body text"
 msgstr "Kein Nachrichtentext"
 
-#: lib/IMAP/Client.php:474
+#: lib/IMAP/Client.php:476
 msgid "No message returned."
 msgstr "Keine Nachricht gefunden."
 
@@ -2876,14 +2876,14 @@ msgstr "Es wurde kein pers
 msgid "No personal S/MIME certificates imported."
 msgstr "Es wurden keine privaten S/MIME-Zertifikate importiert."
 
-#: lib/MIME/Viewer/pkcs7.php:302
+#: lib/MIME/Viewer/pkcs7.php:305
 msgid ""
 "No personal private key exists so the message is unable to be decrypted."
 msgstr ""
 "Sie haben zur Zeit keinen privaten Schlüssel, so dass die Nachricht nicht "
 "entschlüsselt werden kann."
 
-#: lib/IMAP/Client.php:374
+#: lib/IMAP/Client.php:376
 msgid "No supported IMAP authentication method could be found."
 msgstr ""
 "Es wurde keine unterstützte Authentifizierungsmethode für IMAP gefunden."
@@ -2903,7 +2903,7 @@ msgstr "Kein Teilnehmer"
 msgid "None"
 msgstr "Keine"
 
-#: compose.php:1042
+#: compose.php:1043
 msgid "Normal"
 msgstr "Normal"
 
@@ -2941,7 +2941,7 @@ msgstr "Beachten Sie, dass dieser Vorgang einige Zeit dauern kann"
 msgid "Notepads"
 msgstr "Notizblöcke"
 
-#: config/hooks.php.dist:481
+#: config/hooks.php.dist:522
 msgid "Notes"
 msgstr "Bemerkungen"
 
@@ -2994,7 +2994,7 @@ msgstr "Or_dner anzeigen"
 msgid "Open Folder"
 msgstr "Ordner anzeigen"
 
-#: lib/IMAP/Tree.php:2033
+#: lib/IMAP/Tree.php:2034
 msgid "Opened Folder"
 msgstr "Geöffneter Ordner"
 
@@ -3025,15 +3025,15 @@ msgid "Outbound Server"
 msgstr "Postausgangs-Server"
 
 #: pgp.php:44 lib/MIME/Viewer/pgp.php:165 lib/MIME/Viewer/pgp.php:213
-#: lib/MIME/Viewer/pgp.php:309
+#: lib/MIME/Viewer/pgp.php:314
 msgid "PGP"
 msgstr "PGP"
 
-#: lib/IMP.php:1450
+#: lib/IMP.php:1452
 msgid "PGP Encrypt Message"
 msgstr "Verschlüsseln (PGP)"
 
-#: lib/IMP.php:1455
+#: lib/IMP.php:1457
 msgid "PGP Encrypt Message with passphrase"
 msgstr "Mit Passwort verschlüsseln (PGP)"
 
@@ -3070,19 +3070,19 @@ msgstr "Der 
 msgid "PGP Public Keyring"
 msgstr "Öffentlicher PGP-Schlüsselbund"
 
-#: lib/IMP.php:1451
+#: lib/IMP.php:1453
 msgid "PGP Sign Message"
 msgstr "Unterzeichnen (PGP)"
 
-#: lib/IMP.php:1452
+#: lib/IMP.php:1454
 msgid "PGP Sign/Encrypt Message"
 msgstr "Unterzeichnen und verschlüsseln (PGP)"
 
-#: lib/IMP.php:1456
+#: lib/IMP.php:1458
 msgid "PGP Sign/Encrypt Message with passphrase"
 msgstr "Unterzeichnen und mit Passwort verschlüsseln (PGP)"
 
-#: compose.php:732
+#: compose.php:733
 msgid ""
 "PGP encryption cannot be used by default as public keys cannot be found for "
 "all recipients."
@@ -3302,7 +3302,7 @@ msgstr "Bitte geben Sie Ihr Passwort an."
 msgid "Please provide your username."
 msgstr "Bitte geben Sie Ihren Benutzernamen an."
 
-#: lib/Compose.php:2790 lib/UI/Compose.php:26
+#: lib/Compose.php:2794 lib/UI/Compose.php:26
 msgid "Please resolve ambiguous or invalid addresses."
 msgstr "Bitte mehrdeutige oder ungültige Adressen korrigieren."
 
@@ -3338,7 +3338,7 @@ msgstr "Powered by Horde"
 msgid "Precede your signature with dashes ('-- ')?"
 msgstr "Striche ('-- ') vor der Signatur einfügen?"
 
-#: config/hooks.php.dist:497
+#: config/hooks.php.dist:538
 msgid "Preferences"
 msgstr "Benutzereinstellungen"
 
@@ -3346,7 +3346,7 @@ msgstr "Benutzereinstellungen"
 msgid "Preferences successfully updated."
 msgstr "Die Einstellungen wurden erfolgreich gespeichert."
 
-#: compose.php:1213
+#: compose.php:1217
 msgid "Preview"
 msgstr "Vorschau"
 
@@ -3400,7 +3400,7 @@ msgstr "Protokoll"
 msgid "Protocol:"
 msgstr "Protokoll:"
 
-#: lib/Crypt/PGP.php:489
+#: lib/Crypt/PGP.php:491
 msgid "Public PGP keyserver support has been disabled."
 msgstr ""
 "Die Unterstützung für öffentliche PGP-Schlüsselserver ist deaktiviert worden."
@@ -3540,7 +3540,7 @@ msgstr "Diese Nachricht umleiten"
 msgid "Redoes your last action"
 msgstr "Führt letzte Aktion erneut aus"
 
-#: folders.php:361
+#: folders.php:372
 msgid "Refresh"
 msgstr "Aktualisiere"
 
@@ -3552,7 +3552,7 @@ msgstr "Ordner
 msgid "Reload"
 msgstr "Aktualisieren"
 
-#: folders.php:351
+#: folders.php:362
 msgid "Reload View"
 msgstr "Ansicht a_ktualisieren"
 
@@ -3628,7 +3628,7 @@ msgstr "Mit erfragten Frei/Gebucht-Informationen antworten."
 msgid "Reply-To"
 msgstr "Antwort an"
 
-#: lib/Compose.php:1971
+#: lib/Compose.php:1975
 msgid "Reply-To: "
 msgstr "Antwort an: "
 
@@ -3716,12 +3716,12 @@ msgstr "Die Rechte f
 msgid "Role"
 msgstr "Rolle"
 
-#: smime.php:67 lib/MIME/Viewer/pkcs7.php:173 lib/MIME/Viewer/pkcs7.php:293
-#: lib/MIME/Viewer/pkcs7.php:485
+#: smime.php:67 lib/MIME/Viewer/pkcs7.php:173 lib/MIME/Viewer/pkcs7.php:296
+#: lib/MIME/Viewer/pkcs7.php:488
 msgid "S/MIME"
 msgstr "S/MIME"
 
-#: lib/IMP.php:1460
+#: lib/IMP.php:1462
 msgid "S/MIME Encrypt Message"
 msgstr "Verschlüsseln (S/MIME)"
 
@@ -3767,11 +3767,11 @@ msgstr "
 msgid "S/MIME Public/Private Keypair successfully added."
 msgstr "Das öffentliche/private Schlüsselpaar wurde erfolgreich gespeichert."
 
-#: lib/IMP.php:1461
+#: lib/IMP.php:1463
 msgid "S/MIME Sign Message"
 msgstr "Unterzeichnen (S/MIME)"
 
-#: lib/IMP.php:1462
+#: lib/IMP.php:1464
 msgid "S/MIME Sign/Encrypt Message"
 msgstr "Unterzeichnen und verschlüsseln (S/MIME)"
 
@@ -3779,7 +3779,7 @@ msgstr "Unterzeichnen und verschl
 msgid "S/MIME support is disabled on this system."
 msgstr "Die S/MIME-Unterstützung wurde auf diesem System deaktiviert."
 
-#: lib/MIME/Viewer/pkcs7.php:297
+#: lib/MIME/Viewer/pkcs7.php:300
 msgid ""
 "S/MIME support is not currently enabled so the message is unable to be "
 "decrypted."
@@ -3826,7 +3826,7 @@ msgstr "SMTP"
 msgid "SMTP Port"
 msgstr "SMTP-Port"
 
-#: compose.php:1017
+#: compose.php:1018
 msgid "S_ubject"
 msgstr "Betre_ff"
 
@@ -3843,7 +3843,7 @@ msgstr "Speichern unter"
 msgid "Save"
 msgstr "Speichern"
 
-#: compose.php:1189
+#: compose.php:1193
 msgid "Save Attachments with message in sent-mail folder?"
 msgstr ""
 "Anhänge zusammen mit Nachrichten im Ordner für gesendete Nachrichten "
@@ -3871,7 +3871,7 @@ msgstr "Einstellungen speichern"
 msgid "Save Stationery"
 msgstr "Vorlage speichern"
 
-#: compose.php:930
+#: compose.php:931
 msgid "Save _Draft"
 msgstr "_Entwurf speichern"
 
@@ -4051,7 +4051,7 @@ msgstr "Die Nachricht ohne ein Betreff verschicken?"
 msgid "Sent"
 msgstr "Gesendet"
 
-#: lib/IMAP/Tree.php:2005
+#: lib/IMAP/Tree.php:2006
 msgid "Sent mail folder"
 msgstr "Ordner für gesendete Nachrichten"
 
@@ -4167,7 +4167,7 @@ msgstr "Nur eingeblendete Ordner anzeigen"
 msgid "Show Size"
 msgstr "Größe anzeigen"
 
-#: folders.php:380
+#: folders.php:391
 msgid "Show Unsubscribed"
 msgstr "Ausge_blendete Ordner anzeigen"
 
@@ -4267,7 +4267,7 @@ msgstr "Sortieren nach Empf
 msgid "Spam"
 msgstr "Spam"
 
-#: lib/IMAP/Tree.php:1998
+#: lib/IMAP/Tree.php:1999
 msgid "Spam folder"
 msgstr "Spam-Ordner"
 
@@ -4275,7 +4275,7 @@ msgstr "Spam-Ordner"
 msgid "Spam folder:"
 msgstr "Spam-Ordner:"
 
-#: compose.php:1098
+#: compose.php:1099
 msgid "Special Characters"
 msgstr "Sonderzeichen"
 
@@ -4293,10 +4293,10 @@ msgstr "Block teilen"
 
 #: lib/MIME/Viewer/itip.php:599 lib/MIME/Viewer/itip.php:601
 #: lib/MIME/Viewer/itip.php:775 lib/MIME/Viewer/itip.php:777
-msgid "Start"
-msgstr "Beginn"
+msgid "Start:"
+msgstr "Beginn:"
 
-#: compose.php:1056 templates/stationery/stationery.html:8
+#: compose.php:1057 templates/stationery/stationery.html:8
 #: templates/stationery/stationery.html:12
 msgid "Stationery"
 msgstr "Vorlagen"
@@ -4367,7 +4367,7 @@ msgstr "Einblenden"
 msgid "Subscript"
 msgstr "Tiefgestellt"
 
-#: lib/MIME/Viewer/pkcs7.php:445 lib/MIME/Viewer/pgp.php:451
+#: lib/MIME/Viewer/pkcs7.php:448 lib/MIME/Viewer/pgp.php:456
 #: lib/MIME/Viewer/status.php:86
 msgid "Success"
 msgstr "Erfolg"
@@ -4409,7 +4409,7 @@ msgstr "Zielordner:"
 msgid "Task Lists"
 msgstr "Aufgabenlisten"
 
-#: config/hooks.php.dist:473
+#: config/hooks.php.dist:514
 msgid "Tasks"
 msgstr "Aufgaben"
 
@@ -4454,7 +4454,7 @@ msgstr "Schriftgr
 msgid "The From: column of the message should be linked:"
 msgstr "Die Von: Spalte der Nachricht soll so verlinkt werden:"
 
-#: lib/IMAP/Client.php:432
+#: lib/IMAP/Client.php:434
 msgid ""
 "The IMAP server does not appear to support the authentication method "
 "selected. Please contact your system administrator."
@@ -4539,7 +4539,7 @@ msgstr "Der Termin wurde Ihrem Kalender hinzugef
 msgid "The event was updated in your calendar."
 msgstr "Der Termin wurde in Ihrem Kalender aktualisiert."
 
-#: lib/Compose.php:2047
+#: lib/Compose.php:2051
 #, php-format
 msgid "The file %s could not be attached."
 msgstr "Die Datei %s konnte nicht angehängt werden."
@@ -4549,7 +4549,7 @@ msgstr "Die Datei %s konnte nicht angeh
 msgid "The folder \"%s\" already exists"
 msgstr "Der Ordner \"%s\" existiert bereits"
 
-#: folders.php:248 lib/Folder.php:190
+#: folders.php:259 lib/Folder.php:190
 #, php-format
 msgid "The folder \"%s\" may not be deleted."
 msgstr "Der Ordner \"%s\" darf nicht gelöscht werden."
@@ -4636,14 +4636,14 @@ msgstr ""
 msgid "The message being composed has been closed. Exiting."
 msgstr "Die Nachricht, die erstellt wurde, ist geschlossen worden. Abbruch."
 
-#: lib/MIME/Viewer/pgp.php:376
+#: lib/MIME/Viewer/pgp.php:381
 msgid ""
 "The message below does not appear to be a valid PGP encrypted message. "
 "Error: "
 msgstr ""
 "Dies scheint keine gültige PGP-verschlüsselte Nachricht zu sein. Fehler:"
 
-#: lib/MIME/Viewer/pgp.php:252 lib/MIME/Viewer/pgp.php:411
+#: lib/MIME/Viewer/pgp.php:252 lib/MIME/Viewer/pgp.php:416
 msgid ""
 "The message below does not appear to be in the correct PGP format (according "
 "to RFC 2015)."
@@ -4651,7 +4651,7 @@ msgstr ""
 "Die Nachricht unten ist anscheinend nicht im korrekten PGP-Format (nach RFC "
 "2015)."
 
-#: lib/MIME/Viewer/pgp.php:371
+#: lib/MIME/Viewer/pgp.php:376
 msgid "The message below has been compressed with PGP."
 msgstr "Die Nachricht unten wurde mit PGP komprimiert."
 
@@ -4680,7 +4680,7 @@ msgstr ""
 msgid "The message below has been digitally signed with PGP."
 msgstr "Die Nachricht unten wurde mit PGP digital unterschrieben."
 
-#: lib/MIME/Viewer/pgp.php:313
+#: lib/MIME/Viewer/pgp.php:318
 msgid ""
 "The message below has been encrypted with PGP, however, PGP support is "
 "disabled so the message cannot be decrypted."
@@ -4688,7 +4688,7 @@ msgstr ""
 "Die Nachricht unten wurde mit PGP verschlüsselt, aber die PGP-Unterstützung "
 "wurde deaktiviert, so dass die Nachricht nicht entschlüsselt werden kann."
 
-#: lib/MIME/Viewer/pgp.php:355
+#: lib/MIME/Viewer/pgp.php:360
 msgid ""
 "The message below has been encrypted with PGP, however, no personal private "
 "key exists so the message cannot be decrypted."
@@ -4697,11 +4697,11 @@ msgstr ""
 "persönlicher privater Schlüssel, mit dem die Nachricht entschlüsselt werden "
 "könnte."
 
-#: lib/MIME/Viewer/pgp.php:371
+#: lib/MIME/Viewer/pgp.php:376
 msgid "The message below has been encrypted with PGP."
 msgstr "Die Nachricht unten wurde mit PGP verschlüsselt."
 
-#: lib/MIME/Viewer/pgp.php:365
+#: lib/MIME/Viewer/pgp.php:370
 msgid ""
 "The message below has been encrypted with PGP. You must enter the passphrase "
 "for your PGP private key before it can be decrypted."
@@ -4710,7 +4710,7 @@ msgstr ""
 "Ihren persönlichen privaten Schlüssel angeben, mit dem die Nachricht "
 "entschlüsselt werden kann."
 
-#: lib/MIME/Viewer/pgp.php:348
+#: lib/MIME/Viewer/pgp.php:353
 msgid ""
 "The message below has been encrypted with PGP. You must enter the passphrase "
 "that was used to encrypt this message."
@@ -4718,11 +4718,11 @@ msgstr ""
 "Die Nachricht unten wurde mit PGP verschlüsselt, Sie müssen das Passwort "
 "angeben, mit dem diese Nachricht verschlüsselt wurde."
 
-#: lib/MIME/Viewer/pgp.php:455
+#: lib/MIME/Viewer/pgp.php:460
 msgid "The message below has been verified."
 msgstr "Die Nachricht unten wurde überprüft und bestätigt."
 
-#: lib/Crypt/PGP.php:380
+#: lib/Crypt/PGP.php:382
 msgid "The message below has not been digitally signed or encrypted with PGP."
 msgstr ""
 "Die Nachricht unten wurde nicht mit PGP digital unterschrieben und "
@@ -4753,7 +4753,7 @@ msgstr "Diese Nachricht wurde bei Ihrem Systemadministrator als Spam gemeldet."
 msgid "The message has been reported as spam."
 msgstr "Diese Nachricht wurde als Spam gemeldet."
 
-#: lib/MIME/Viewer/pkcs7.php:450
+#: lib/MIME/Viewer/pkcs7.php:453
 #, php-format
 msgid "The message has been verified. Sender: %s."
 msgstr "Die Nachricht wurde überprüft und bestätigt. Absender: %s."
@@ -4869,7 +4869,7 @@ msgstr ""
 msgid "There are no messages in this mailbox."
 msgstr "In diesem Ordner sind keine Nachrichten vorhanden"
 
-#: thread.php:104
+#: thread.php:108
 msgid "There is no text that can be displayed inline."
 msgstr "Es gibt keine anzeigbaren Nachrichtenteile."
 
@@ -4972,7 +4972,7 @@ msgstr ""
 msgid "This message contains a Macintosh file."
 msgstr "Diese Nachricht enthält eine Macintosh-Datei."
 
-#: lib/MIME/Viewer/pkcs7.php:476
+#: lib/MIME/Viewer/pkcs7.php:479
 msgid ""
 "This message contains an attachment that has been digitally signed via S/"
 "MIME."
@@ -4980,7 +4980,7 @@ msgstr ""
 "Diese Nachricht enthält einen Anhang, der mit S/MIME digital unterschrieben "
 "wurde."
 
-#: lib/MIME/Viewer/pkcs7.php:480
+#: lib/MIME/Viewer/pkcs7.php:483
 msgid "This message contains an attachment that has been encrypted via S/MIME."
 msgstr ""
 "Diese Nachricht enthält einen Anhang, der mit S/MIME verschlüsselt wurde."
@@ -5001,7 +5001,7 @@ msgstr "Diese Nachricht scheint nicht im korrekten S/MIME-Format zu sein."
 msgid "This message has been digitally signed via S/MIME."
 msgstr "Diese Nachricht wurde mit S/MIME digital unterschrieben."
 
-#: lib/MIME/Viewer/pkcs7.php:170 lib/MIME/Viewer/pkcs7.php:294
+#: lib/MIME/Viewer/pkcs7.php:170 lib/MIME/Viewer/pkcs7.php:297
 msgid "This message has been encrypted via S/MIME."
 msgstr "Diese Nachricht wurde mit S/MIME verschlüsselt."
 
@@ -5036,7 +5036,7 @@ msgstr "Dieses Fenster muss vom Fenster f
 msgid "Thread Display:"
 msgstr "Themenansicht:"
 
-#: thread.php:177 config/prefs.php.dist:1206
+#: thread.php:181 config/prefs.php.dist:1206
 msgid "Thread View"
 msgstr "Themenansicht"
 
@@ -5048,7 +5048,7 @@ msgstr "Vorschau der angeh
 msgid "Thumbnail of attached image"
 msgstr "Vorschau des angehängten Bildes"
 
-#: compose.php:831 mailbox.php:587 lib/Search.php:716 lib/UI/Mailbox.php:90
+#: compose.php:832 mailbox.php:587 lib/Search.php:716 lib/UI/Mailbox.php:90
 #: lib/UI/Message.php:26 templates/contacts/contacts.html:40
 #: templates/login/recompose.html:14
 msgid "To"
@@ -5102,7 +5102,7 @@ msgstr ""
 "Um eine TLS-Verbindung benutzen zu können, müssen Sie PHP Version 5.1.0 oder "
 "höher einsetzen."
 
-#: thread.php:117 templates/thread/thread.html:31
+#: thread.php:121 templates/thread/thread.html:31
 msgid "To:"
 msgstr "An:"
 
@@ -5130,7 +5130,7 @@ msgstr "Traditionell"
 msgid "Trash"
 msgstr "Papierkorb"
 
-#: lib/IMAP/Tree.php:1985
+#: lib/IMAP/Tree.php:1986
 msgid "Trash folder"
 msgstr "\"Papierkorb\"-Ordner"
 
@@ -5181,11 +5181,11 @@ msgstr "Unbekannte Empf
 msgid "Undoes your last action"
 msgstr "Macht die letzte Aktion rückgängig"
 
-#: lib/IMAP/Client.php:462
+#: lib/IMAP/Client.php:464
 msgid "Unexpected response from server to AUTHENTICATE command."
 msgstr "Unerwartete Antwort des Servers auf AUTHENTICATE Kommando."
 
-#: lib/IMAP/Client.php:428
+#: lib/IMAP/Client.php:430
 msgid "Unexpected response from server to Digest-MD5 response."
 msgstr "Unerwartete Antwort des Servers auf Digest-MD5 Anfrage."
 
@@ -5338,7 +5338,7 @@ msgstr "Pers
 msgid "View Thread"
 msgstr "Thema Anzeigen"
 
-#: lib/MIME/Viewer/pkcs7.php:484
+#: lib/MIME/Viewer/pkcs7.php:487
 msgid "View attachment in a separate window"
 msgstr "Anhang in einem neuen Fenster anzeigen"
 
@@ -5350,7 +5350,7 @@ msgstr "Inhalt in einem neuen Fenster anzeigen"
 msgid "View event"
 msgstr "Termin anzeigen"
 
-#: folders.php:436 mailbox.php:695
+#: folders.php:447 mailbox.php:695
 #, php-format
 msgid "View messages in %s"
 msgstr "Nachrichten in %s anzeigen"
@@ -5384,7 +5384,7 @@ msgstr "Virtuelle Ordner m
 msgid "Virtual INBOX"
 msgstr "Virtueller Posteingang"
 
-#: lib/IMAP/Tree.php:2025
+#: lib/IMAP/Tree.php:2026
 msgid "Virtual INBOX Folder"
 msgstr "Virtueller Posteingangsordner"
 
@@ -5392,7 +5392,7 @@ msgstr "Virtueller Posteingangsordner"
 msgid "Virtual Trash"
 msgstr "Virtueller Papierkorb"
 
-#: lib/IMAP/Tree.php:2021
+#: lib/IMAP/Tree.php:2022
 msgid "Virtual Trash Folder"
 msgstr "Virtueller Papierkorb"
 
@@ -5400,7 +5400,7 @@ msgstr "Virtueller Papierkorb"
 msgid "Virtual folder label:"
 msgstr "Name des Virtuellen Ordners:"
 
-#: lib/Crypt/PGP.php:380 lib/MIME/Viewer/pkcs7.php:439
+#: lib/Crypt/PGP.php:382 lib/MIME/Viewer/pkcs7.php:442
 msgid "Warning"
 msgstr "Warnung"
 
@@ -5613,14 +5613,14 @@ msgstr "Sie haben keine externen E-Mail-Konten angelegt."
 msgid "You must enter at least one recipient."
 msgstr "Sie müssen mindestens einen Empfänger angeben."
 
-#: lib/MIME/Viewer/pgp.php:365
+#: lib/MIME/Viewer/pgp.php:370
 msgid ""
 "You must enter the passphrase for your PGP private key to view this message."
 msgstr ""
 "Sie müssen das Passwort für Ihren privaten PGP-Schlüssel angeben, um diese "
 "Nachricht lesen zu können."
 
-#: lib/MIME/Viewer/pkcs7.php:313
+#: lib/MIME/Viewer/pkcs7.php:316
 msgid ""
 "You must enter the passphrase for your S/MIME private key to view this "
 "message"
@@ -5628,7 +5628,7 @@ msgstr ""
 "Sie müssen das Passwort für Ihren privaten S/MIME-Schlüssel angeben, um "
 "diese Nachricht lesen zu können"
 
-#: lib/MIME/Viewer/pgp.php:348
+#: lib/MIME/Viewer/pgp.php:353
 msgid "You must enter the passphrase that was used to encrypt this message."
 msgstr ""
 "Sie müssen das Passwort angeben, das benutzt wurde, um diese Nachricht zu "
@@ -5796,8 +5796,8 @@ msgstr "[Anhang entfernt: Ehemaliger Anhangstyp: %s, Name: %s]"
 msgid "[Hide Addresses]"
 msgstr "[Adressen verstecken]"
 
-#: message.php:285 rss.php:75 mailbox.php:719 lib/Compose.php:1891
-#: lib/Compose.php:2369
+#: message.php:285 rss.php:75 mailbox.php:719 lib/Compose.php:1895
+#: lib/Compose.php:2373
 msgid "[No Subject]"
 msgstr "[Kein Betreff]"
 
@@ -5814,7 +5814,7 @@ msgstr "[Adressen anzeigen -"
 msgid "[Show Addresses - %d recipients]"
 msgstr "[Adressen anzeigen - %d Empfänger]"
 
-#: lib/Compose.php:3015
+#: lib/Compose.php:3019
 msgid "[Truncated Text]"
 msgstr "[Text gekürzt]"
 
@@ -5822,7 +5822,7 @@ msgstr "[Text gek
 msgid "[View the raw key]"
 msgstr "[Unformatiert anzeigen]"
 
-#: compose.php:966
+#: compose.php:967
 msgid "_Bcc"
 msgstr "_Bcc"
 
@@ -5830,7 +5830,7 @@ msgstr "_Bcc"
 msgid "_Blacklist"
 msgstr "Auss_chlussliste"
 
-#: compose.php:963
+#: compose.php:964
 msgid "_Cc"
 msgstr "_Cc"
 
@@ -5842,7 +5842,7 @@ msgstr "_L
 msgid "_Folders"
 msgstr "_Ordner"
 
-#: compose.php:943
+#: compose.php:944
 msgid "_Identity"
 msgstr "_Identität"
 
@@ -5866,7 +5866,7 @@ msgstr "_Neue Nachricht"
 msgid "_Print"
 msgstr "D_rucken"
 
-#: compose.php:1035
+#: compose.php:1036
 msgid "_Priority"
 msgstr "_Priorität"
 
@@ -5883,7 +5883,7 @@ msgstr "An_tworten"
 msgid "_Search"
 msgstr "_Suche"
 
-#: compose.php:928
+#: compose.php:929
 msgid "_Send Message"
 msgstr "_Senden"
 
@@ -5891,7 +5891,7 @@ msgstr "_Senden"
 msgid "_Thread"
 msgstr "_Thema"
 
-#: compose.php:959 compose.php:961
+#: compose.php:960 compose.php:962
 msgid "_To"
 msgstr "_An"
 
@@ -5915,7 +5915,7 @@ msgstr "Adressat unbekannt"
 msgid "and"
 msgstr "und"
 
-#: lib/Compose.php:2002
+#: lib/Compose.php:2006
 msgid "attachment"
 msgstr "Anhang"
 
diff --git a/po/fr_FR.po b/po/fr_FR.po
index 146863c..f7552ee 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fr_FR\n"
 "Report-Msgid-Bugs-To: dev at lists.horde.org\n"
-"POT-Creation-Date: 2009-01-13 10:07+0100\n"
-"PO-Revision-Date: 2009-01-13 14:48+0100\n"
+"POT-Creation-Date: 2009-05-22 08:12+0200\n"
+"PO-Revision-Date: 2009-05-22 08:12+0200\n"
 "Last-Translator: Yannick Sebastia <yannick.sebastia at ecole-navale.fr>\n"
 "Language-Team: French <i18n at lists.horde.org>\n"
 "MIME-Version: 1.0\n"
@@ -139,12 +139,12 @@ msgstr "%s de %s"
 msgid "%s has accepted."
 msgstr "%s a accepté."
 
-#: lib/MIME/Viewer/itip.php:696
+#: lib/MIME/Viewer/itip.php:744
 #, php-format
 msgid "%s has cancelled \"%s\"."
 msgstr "%s a annulé « %s »."
 
-#: lib/MIME/Viewer/itip.php:701
+#: lib/MIME/Viewer/itip.php:749
 #, php-format
 msgid "%s has cancelled an instance of the recurring \"%s\"."
 msgstr "%s a annulé une instance de « %s »."
@@ -154,17 +154,17 @@ msgstr "%s a annul
 msgid "%s has declined."
 msgstr "%s a refusé."
 
-#: lib/MIME/Viewer/itip.php:536
+#: lib/MIME/Viewer/itip.php:584
 #, php-format
 msgid "%s has replied to a free/busy request."
 msgstr "%s a répondu à une requête sur ses disponibilités."
 
-#: lib/MIME/Viewer/itip.php:687
+#: lib/MIME/Viewer/itip.php:735
 #, php-format
 msgid "%s has replied to the invitation to \"%s\"."
 msgstr "%s a répondu à l'invitation de « %s »."
 
-#: lib/MIME/Viewer/itip.php:527
+#: lib/MIME/Viewer/itip.php:575
 #, php-format
 msgid "%s has sent you free/busy information."
 msgstr "%s vous a envoyé ses disponibilités."
@@ -179,17 +179,17 @@ msgstr "%s a 
 msgid "%s report from %s"
 msgstr "%s raporté par %s"
 
-#: lib/MIME/Viewer/itip.php:532
+#: lib/MIME/Viewer/itip.php:580
 #, php-format
 msgid "%s requests your free/busy information."
 msgstr "%s demande vos disponibilités."
 
-#: lib/MIME/Viewer/itip.php:658
+#: lib/MIME/Viewer/itip.php:706
 #, php-format
 msgid "%s requests your presence at \"%s\"."
 msgstr "%s réclame votre présence à « %s »."
 
-#: lib/MIME/Viewer/itip.php:638
+#: lib/MIME/Viewer/itip.php:686
 #, php-format
 msgid "%s wants to notify you about changes of \"%s\"."
 msgstr "%s souhaite vous informer des changements de « %s »."
@@ -199,37 +199,32 @@ msgstr "%s souhaite vous informer des changements de 
 msgid "%s was successfully added to \"%s\"."
 msgstr "« %s » a bien été ajouté à « %s »."
 
-#: lib/MIME/Viewer/itip.php:675
+#: lib/MIME/Viewer/itip.php:723
 #, php-format
 msgid "%s wishes to ammend \"%s\"."
 msgstr "%s souhaite compléter « %s »."
 
-#: lib/MIME/Viewer/itip.php:627 lib/MIME/Viewer/itip.php:659
-#: lib/MIME/Viewer/itip.php:846
+#: lib/MIME/Viewer/itip.php:675 lib/MIME/Viewer/itip.php:707
+#: lib/MIME/Viewer/itip.php:894
 #, php-format
 msgid "%s wishes to make you aware of \"%s\"."
 msgstr "%s souhaite vous informer de « %s »."
 
-#: lib/MIME/Viewer/itip.php:682
+#: lib/MIME/Viewer/itip.php:730
 #, php-format
 msgid "%s wishes to receive the latest information about \"%s\"."
 msgstr "%s souhaite recevoir les dernières informations sur « %s »."
 
-#: compose.php:1228
+#: compose.php:1229
 #, php-format
 msgid "%s%% of allowed size"
 msgstr "%s %% de la taille allouée"
 
-#: message.php:282 message.php:287
+#: message.php:282 message.php:287 message.php:505
 #, php-format
 msgid "%s: %s"
 msgstr "%s : %s"
 
-#: message.php:505
-#, php-format
-msgid "%s: %s (%d&nbsp;of&nbsp;%d)"
-msgstr "%s : %s (%d&nbsp;de&nbsp;%d)"
-
 #: lib/Compose.php:1909
 #, php-format
 msgid "%u Forwarded Messages"
@@ -240,6 +235,11 @@ msgstr "%u messages transf
 msgid "%u of %u messages in %s unread."
 msgstr "%u de %u messages parmi %s non lus."
 
+#: message.php:506
+#, php-format
+msgid "(%d&nbsp;of&nbsp;%d)"
+msgstr "(%d&nbsp;de&nbsp;%d)"
+
 #: stationery.php:129
 msgid "(HTML)"
 msgstr "(HTML)"
@@ -307,19 +307,19 @@ msgstr "A propos de cet 
 msgid "Above the message text"
 msgstr "Au dessus du corps du message"
 
-#: lib/MIME/Viewer/itip.php:665
+#: lib/MIME/Viewer/itip.php:713
 msgid "Accept and add to my calendar"
 msgstr "Accepter et ajouter à mon agenda."
 
-#: lib/MIME/Viewer/itip.php:662
+#: lib/MIME/Viewer/itip.php:710
 msgid "Accept and update in my calendar"
 msgstr "Accepter et ajouter à mon agenda"
 
-#: lib/MIME/Viewer/itip.php:668
+#: lib/MIME/Viewer/itip.php:716
 msgid "Accept request"
 msgstr "Accepter la demande"
 
-#: lib/MIME/Viewer/itip.php:961
+#: lib/MIME/Viewer/itip.php:1009
 msgid "Accepted"
 msgstr "Accepté"
 
@@ -331,8 +331,8 @@ msgstr "Accept
 msgid "Account's name:"
 msgstr "Nom du compte :"
 
-#: lib/MIME/Viewer/itip.php:570 lib/MIME/Viewer/itip.php:808
-#: lib/MIME/Viewer/itip.php:809 lib/MIME/Viewer/itip.php:940
+#: lib/MIME/Viewer/itip.php:618 lib/MIME/Viewer/itip.php:856
+#: lib/MIME/Viewer/itip.php:857 lib/MIME/Viewer/itip.php:988
 msgid "Actions"
 msgstr "Actions"
 
@@ -346,15 +346,15 @@ msgstr "Ajouter %s 
 msgid "Add source"
 msgstr "Ajouter une source"
 
-#: lib/MIME/Viewer/itip.php:629
+#: lib/MIME/Viewer/itip.php:677
 msgid "Add this to my calendar"
 msgstr "À ajouter à mon agenda"
 
-#: lib/MIME/Viewer/itip.php:848
+#: lib/MIME/Viewer/itip.php:896
 msgid "Add this to my tasklist"
 msgstr "Ajouter ceci à ma liste de tâches"
 
-#: lib/MIME/Viewer/itip.php:666
+#: lib/MIME/Viewer/itip.php:714
 msgid "Add to my calendar"
 msgstr "Ajouter à mon agenda"
 
@@ -399,7 +399,7 @@ msgid "Additional message error details can be viewed %s."
 msgstr ""
 "Des détails complémentaires au message d'erreur peuvent être consultés %s."
 
-#: contacts.php:120 compose.php:824 compose.php:1070
+#: contacts.php:120 compose.php:825 compose.php:1071
 #: templates/contacts/contacts.html:8
 msgid "Address Book"
 msgstr "Carnet d'adresses"
@@ -531,7 +531,7 @@ msgid "An unknown error occured while creating the new task."
 msgstr ""
 "Une erreur inconnue est survenue pendant la création de la nouvelle tâche."
 
-#: lib/MIME/Viewer/itip.php:834
+#: lib/MIME/Viewer/itip.php:882
 msgid "An unknown person"
 msgstr "Une personne inconnue"
 
@@ -579,11 +579,11 @@ msgstr ""
 "Êtes-vous certain de vouloir supprimer cette définition de répertoire "
 "virtuel ?"
 
-#: pgp.php:414 smime.php:315
+#: pgp.php:419 smime.php:320
 msgid "Are you sure you want to delete this public key?"
 msgstr "Êtes-vous certain de vouloir supprimer cette clef publique ?"
 
-#: pgp.php:444 smime.php:341
+#: pgp.php:451 smime.php:348
 msgid ""
 "Are you sure you want to delete your keypair? (This is NOT recommended!)"
 msgstr ""
@@ -600,7 +600,7 @@ msgstr ""
 "Êtes-vous certain de vouloir supprimer définitivement toutes les pièces "
 "jointes ?"
 
-#: message.php:553 templates/javascript_defs.php:41
+#: message.php:554 templates/javascript_defs.php:41
 msgid "Are you sure you wish to PERMANENTLY delete these messages?"
 msgstr "Êtes-vous certain de vouloir supprimer définitivement ces messages ?"
 
@@ -613,11 +613,11 @@ msgstr ""
 msgid "Are you sure you wish to delete all mail in this folder?"
 msgstr "Êtes-vous certain de vouloir vider ce dossier ?"
 
-#: lib/IMP.php:856
+#: lib/IMP.php:859
 msgid "Are you sure you wish to empty your spam folder?"
 msgstr "Êtes-vous certain de vouloir vider votre dossier de pourriels ?"
 
-#: lib/IMP.php:848
+#: lib/IMP.php:851
 msgid "Are you sure you wish to empty your trash folder?"
 msgstr "Êtes-vous certain de vouloir vider votre corbeille ?"
 
@@ -645,15 +645,15 @@ msgstr "Croissant"
 msgid "Ask"
 msgstr "Demander"
 
-#: compose.php:1166
+#: compose.php:1167
 msgid "Attach Files"
 msgstr "Joindre les fichiers"
 
-#: compose.php:1155
+#: compose.php:1156
 msgid "Attach a copy of your PGP public key to the message?"
 msgstr "Joindre une copie de votre clef PGP publique à votre message ?"
 
-#: compose.php:1160
+#: compose.php:1161
 msgid "Attach your contact information to the message?"
 msgstr "Joindre vos informations personnelles au message ?"
 
@@ -668,7 +668,7 @@ msgid ""
 msgstr ""
 "La pièce jointe « %s » dépasse les limites de taille. Fichier NON attaché."
 
-#: lib/MIME/Viewer/itip.php:410
+#: lib/MIME/Viewer/itip.php:411
 msgid "Attached is a reply to a calendar request you sent."
 msgstr "Ci-joint une réponse à une requête vers un agenda."
 
@@ -690,11 +690,11 @@ msgstr "Informations sur les pi
 msgid "Attachment stripped: Original attachment type"
 msgstr "Pièce jointe retirée : type d'origine de la pièce jointe"
 
-#: compose.php:1104 lib/Compose.php:2609 templates/compose/compose.html:252
+#: compose.php:1105 lib/Compose.php:2609 templates/compose/compose.html:252
 msgid "Attachments"
 msgstr "Pièces jointes"
 
-#: lib/MIME/Viewer/itip.php:760 lib/MIME/Viewer/itip.php:889
+#: lib/MIME/Viewer/itip.php:808 lib/MIME/Viewer/itip.php:937
 msgid "Attendees"
 msgstr "Présents"
 
@@ -706,7 +706,7 @@ msgstr "Attention"
 msgid "Auth_imp: Required IMAP extension not found."
 msgstr "Auth_imp : extension requise IMAP non trouvée."
 
-#: config/hooks.php.dist:521
+#: config/hooks.php.dist:538
 msgid "Authentication failed."
 msgstr "Authentification échouée."
 
@@ -722,16 +722,16 @@ msgstr ""
 msgid "Available Address books:"
 msgstr "Carnets d'adresses disponibles :"
 
-#: lib/MIME/Viewer/itip.php:793 lib/MIME/Viewer/itip.php:925
+#: lib/MIME/Viewer/itip.php:841 lib/MIME/Viewer/itip.php:973
 msgid "Awaiting Response"
 msgstr "En attente d'une réponse"
 
-#: message.php:523 thread.php:137
+#: message.php:524 thread.php:137
 #, php-format
 msgid "Bac_k to %s"
 msgstr "Re_venir à %s"
 
-#: message.php:523 thread.php:137
+#: message.php:524 thread.php:137
 #, php-format
 msgid "Back to %s"
 msgstr "Revenir à %s"
@@ -780,7 +780,7 @@ msgstr "Ci-dessous le texte brut 
 msgid "Below the message text"
 msgstr "Sous le corps du message"
 
-#: message.php:579 mailbox.php:526
+#: message.php:580 mailbox.php:526
 msgid "Blacklist"
 msgstr "Liste noire"
 
@@ -792,11 +792,11 @@ msgstr "Bloquer les images des messages en HTML sauf demande explicite
 msgid "Body"
 msgstr "Corps"
 
-#: message.php:569 config/prefs.php.dist:764
+#: message.php:570 config/prefs.php.dist:764
 msgid "Body Text Only"
 msgstr "Corps du texte seul"
 
-#: message.php:570 config/prefs.php.dist:765
+#: message.php:571 config/prefs.php.dist:765
 msgid "Body Text with Attachments"
 msgstr "Corps de message avec pièces jointes"
 
@@ -822,11 +822,11 @@ msgid ""
 msgstr ""
 "CRAM-MD5 ou DIGEST-MD5 nécessitent l'installation du paquet PEAR Auth_SASL."
 
-#: compose.php:1024
+#: compose.php:1025
 msgid "C_harset"
 msgstr "_Jeu de caractères"
 
-#: search.php:279 config/hooks.php.dist:455
+#: search.php:279 config/hooks.php.dist:465
 msgid "Calendar"
 msgstr "Agenda"
 
@@ -855,7 +855,7 @@ msgstr "Connexion au serveur de messagerie distant impossible."
 msgid "Cannot connect to the remote mail server: "
 msgstr "Connexion au serveur de messagerie distant impossible : "
 
-#: lib/IMAP/Tree.php:2038
+#: lib/IMAP/Tree.php:2092
 msgid "Cannot directly create mailbox in this folder."
 msgstr "Impossible de créer une boîte de courrier directement dans ce dossier."
 
@@ -874,7 +874,7 @@ msgstr ""
 "Impossible de déplacer les messages vers la Corbeille - aucune Corbeille "
 "définie dans les préférences."
 
-#: pgp.php:277
+#: pgp.php:282
 msgid "Cannot retrieve public key from cache."
 msgstr "Ne peut retrouver la clé public depuis le cache."
 
@@ -891,7 +891,7 @@ msgstr ""
 "L'importation de certificats n'est pas disponible. On ne peut pas envoyer de "
 "fichier sur ce serveur."
 
-#: lib/MIME/Viewer/itip.php:775 lib/MIME/Viewer/itip.php:907
+#: lib/MIME/Viewer/itip.php:823 lib/MIME/Viewer/itip.php:955
 msgid "Chair Person"
 msgstr "Animateur"
 
@@ -1044,7 +1044,7 @@ msgstr "Fermer"
 msgid "Close this window"
 msgstr "Fermer cette fenêtre"
 
-#: lib/IMAP/Tree.php:1983
+#: lib/IMAP/Tree.php:2037
 msgid "Closed Folder"
 msgstr "Dossier fermé"
 
@@ -1076,7 +1076,7 @@ msgstr "Combiner tous les espaces de nommages"
 msgid "Comment:"
 msgstr "Commentaire :"
 
-#: lib/MIME/Viewer/itip.php:977
+#: lib/MIME/Viewer/itip.php:1025
 msgid "Completed"
 msgstr "Terminé"
 
@@ -1100,11 +1100,11 @@ msgstr "Configurer l'affichage des messages."
 msgid "Configure mail preview options."
 msgstr "Configurer les options de pré-visualisation du courrier."
 
-#: config/hooks.php.dist:517
+#: config/hooks.php.dist:534
 msgid "Connection to server failed."
 msgstr "Échec de la connexion au serveur"
 
-#: config/hooks.php.dist:479
+#: config/hooks.php.dist:489
 msgid "Contacts"
 msgstr "Contacts"
 
@@ -1130,7 +1130,7 @@ msgstr ""
 msgid "Convert textual emoticons into graphical ones?"
 msgstr "Convertir les émoticônes textuels en graphique ?"
 
-#: message.php:519 message.php:707 mailbox.php:486 mailbox.php:893
+#: message.php:520 message.php:707 mailbox.php:486 mailbox.php:895
 msgid "Copy"
 msgstr "Copier"
 
@@ -1138,7 +1138,7 @@ msgstr "Copier"
 msgid "Copy selection"
 msgstr "Copier la sélection"
 
-#: message.php:519 message.php:707 mailbox.php:486 mailbox.php:893
+#: message.php:520 message.php:707 mailbox.php:486 mailbox.php:895
 msgid "Copy to folder"
 msgstr "Copier vers le dossier"
 
@@ -1332,7 +1332,7 @@ msgstr "Date
 msgid "Day"
 msgstr "Jour"
 
-#: lib/MIME/Viewer/itip.php:965
+#: lib/MIME/Viewer/itip.php:1013
 msgid "Declined"
 msgstr "Décliné"
 
@@ -1364,18 +1364,18 @@ msgstr "Crit
 msgid "Default sorting direction:"
 msgstr "Sens du tri par défaut :"
 
-#: lib/MIME/Viewer/itip.php:973
+#: lib/MIME/Viewer/itip.php:1021
 msgid "Delegated"
 msgstr "Délégué"
 
-#: message.php:553 folders.php:418 mailbox.php:508 mailbox.php:510
+#: message.php:554 folders.php:418 mailbox.php:508 mailbox.php:510
 #: lib/IMAP/ACL/rfc4314.php:57 templates/contacts/contacts.html:59
 #: templates/smime/smime.html:35 templates/folders/actions.html:19
 #: templates/pgp/pgp.html:43 templates/fetchmail/fetchmailprefs.html:122
 msgid "Delete"
 msgstr "Supprimer"
 
-#: pgp.php:414 smime.php:315
+#: pgp.php:419 smime.php:320
 #, php-format
 msgid "Delete %s Public Key"
 msgstr "Supprimer la clef publique %s"
@@ -1413,7 +1413,7 @@ msgstr "Supprimer la d
 msgid "Delete fetched messages from remote server?"
 msgstr "Supprimer les messages ramenés du serveur distant ?"
 
-#: lib/MIME/Viewer/itip.php:698
+#: lib/MIME/Viewer/itip.php:746
 msgid "Delete from my calendar"
 msgstr "Supprimer de mon agenda"
 
@@ -1446,7 +1446,7 @@ msgstr "Supprim
 msgid "Deleted messages"
 msgstr "Messages supprimés"
 
-#: compose.php:239
+#: compose.php:240
 #, php-format
 msgid "Deleted the attachment \"%s\"."
 msgstr "Pièce jointe « %s » détruite."
@@ -1455,11 +1455,11 @@ msgstr "Pi
 msgid "Deleting and Moving Messages"
 msgstr "Déplacement et destruction de messages"
 
-#: lib/MIME/Viewer/itip.php:670
+#: lib/MIME/Viewer/itip.php:718
 msgid "Deny request"
 msgstr "Refuser la demande"
 
-#: lib/MIME/Viewer/itip.php:590
+#: lib/MIME/Viewer/itip.php:638
 msgid "Deny request for free/busy information"
 msgstr "Refuser la requête sur les disponibilités"
 
@@ -1467,7 +1467,7 @@ msgstr "Refuser la requ
 msgid "Descending"
 msgstr "Décroissant"
 
-#: lib/MIME/Viewer/itip.php:751 lib/MIME/Viewer/itip.php:882
+#: lib/MIME/Viewer/itip.php:799 lib/MIME/Viewer/itip.php:930
 msgid "Description"
 msgstr "Description"
 
@@ -1578,7 +1578,7 @@ msgstr "T
 msgid "Download %s in .zip Format"
 msgstr "Télécharger %s au format .zip"
 
-#: message.php:679
+#: message.php:680
 msgid "Download All Attachments (in .zip file)"
 msgstr "Télécharger toutes les pièces jointes (en format .zip)"
 
@@ -1595,7 +1595,7 @@ msgstr "T
 msgid "Draft"
 msgstr "Brouillon"
 
-#: lib/IMAP/Tree.php:1938
+#: lib/IMAP/Tree.php:1992
 msgid "Draft folder"
 msgstr "Dossier de brouillons"
 
@@ -1615,7 +1615,7 @@ msgstr "Dynamique"
 msgid "E-mail Address:"
 msgstr "Adresse électronique :"
 
-#: mailbox.php:832
+#: mailbox.php:834
 msgid "END"
 msgstr "FIN"
 
@@ -1673,11 +1673,11 @@ msgstr "Vider"
 msgid "Empty Selected Folders"
 msgstr "Vider les dossiers sélectionnés"
 
-#: lib/IMP.php:856
+#: lib/IMP.php:859
 msgid "Empty _Spam"
 msgstr "Vider le _spam"
 
-#: lib/IMP.php:848
+#: lib/IMP.php:851
 msgid "Empty _Trash"
 msgstr "Vider la _corbeille"
 
@@ -1685,11 +1685,11 @@ msgstr "Vider la _corbeille"
 msgid "Empty folder"
 msgstr "Vider le dossier"
 
-#: pgp.php:465 templates/pgp/pgp.html:2
+#: pgp.php:472 templates/pgp/pgp.html:2
 msgid "Enable PGP functionality?"
 msgstr "Activer les fonctionnalités de PGP ?"
 
-#: smime.php:351 templates/smime/smime.html:2
+#: smime.php:358 templates/smime/smime.html:2
 msgid "Enable S/MIME functionality?"
 msgstr "Activer les fonctionnalités de S/MIME ?"
 
@@ -1697,12 +1697,12 @@ msgstr "Activer les fonctionnalit
 msgid "Enable message previews?"
 msgstr "Activer la pré-visualisation des messages ?"
 
-#: compose.php:1149
+#: compose.php:1150
 msgid "Encr_yption Options"
 msgstr "O_ptions de chiffrement"
 
-#: lib/MIME/Viewer/itip.php:560 lib/MIME/Viewer/itip.php:562
-#: lib/MIME/Viewer/itip.php:736 lib/MIME/Viewer/itip.php:738
+#: lib/MIME/Viewer/itip.php:608 lib/MIME/Viewer/itip.php:610
+#: lib/MIME/Viewer/itip.php:784 lib/MIME/Viewer/itip.php:786
 msgid "End"
 msgstr "Fin"
 
@@ -1719,7 +1719,7 @@ msgstr "Fin du message"
 msgid "End message from %s"
 msgstr "Fin du message de %s"
 
-#: pgp.php:440 smime.php:339
+#: pgp.php:447 smime.php:346
 msgid "Enter Passphrase"
 msgstr "Entrez la phrase secrète"
 
@@ -1739,7 +1739,7 @@ msgstr "Entrez le nom du nouveau dossier de messages envoy
 msgid "Enter the name for your new trash folder"
 msgstr "Entrez le nom de votre nouvelle corbeille"
 
-#: message.php:568 lib/Search.php:741 config/prefs.php.dist:763
+#: message.php:569 lib/Search.php:741 config/prefs.php.dist:763
 msgid "Entire Message"
 msgstr "Message complet"
 
@@ -1762,7 +1762,7 @@ msgstr "Erreur de connexion au serveur IMAP
 msgid "Error displaying message."
 msgstr "Erreur en affichant le message."
 
-#: lib/MIME/Viewer/itip.php:339 lib/MIME/Viewer/itip.php:444
+#: lib/MIME/Viewer/itip.php:340 lib/MIME/Viewer/itip.php:446
 #, php-format
 msgid "Error sending reply: %s."
 msgstr "Erreur lors de l'envoi de la réponse : %s."
@@ -1811,7 +1811,7 @@ msgstr "D
 msgid "Expand Folder"
 msgstr "Développer le dossier"
 
-#: compose.php:826 compose.php:1078
+#: compose.php:827 compose.php:1079
 msgid "Expand Names"
 msgstr "Développer les noms"
 
@@ -1828,7 +1828,7 @@ msgstr ""
 msgid "FCKeditor"
 msgstr "FCKeditor"
 
-#: lib/IMP.php:867 lib/IMP.php:869
+#: lib/IMP.php:870 lib/IMP.php:872
 msgid "F_etch Mail"
 msgstr "Relev_er"
 
@@ -1863,7 +1863,7 @@ msgstr "R
 msgid "Fetchmail: no new messages."
 msgstr "Fetchmail : pas de nouveaux messages."
 
-#: lib/IMP.php:873
+#: lib/IMP.php:876
 msgid "Fi_lters"
 msgstr "Fi_ltres"
 
@@ -1909,7 +1909,7 @@ msgid "First Page"
 msgstr "Première page"
 
 #: message.php:479 mailbox.php:774 templates/message/navbar_navigate.html:10
-#: templates/mailbox/navbar.html:32
+#: templates/mailbox/navbar.html:16 templates/mailbox/navbar.html:32
 msgid "Flagged For Followup"
 msgstr "Marqué pour suivi"
 
@@ -1917,11 +1917,11 @@ msgstr "Marqu
 msgid "Flagged messages"
 msgstr "Messages marqués"
 
-#: message.php:567 mailbox.php:533
+#: message.php:568 mailbox.php:533
 msgid "Fo_rward"
 msgstr "T_ransfert"
 
-#: lib/IMAP/Tree.php:1983 templates/folders/folders_size.html:6
+#: lib/IMAP/Tree.php:2037 templates/folders/folders_size.html:6
 msgid "Folder"
 msgstr "Dossier"
 
@@ -1960,7 +1960,7 @@ msgstr ""
 "Le format de la date dans la vue de boîte aux lettres pour des messages "
 "datés d'aujourd'hui"
 
-#: message.php:567 mailbox.php:533 lib/Compose.php:1796
+#: message.php:568 mailbox.php:533 lib/Compose.php:1796
 msgid "Forward"
 msgstr "Transfert"
 
@@ -1981,7 +1981,7 @@ msgstr "Message transf
 msgid "Forwarded message from %s"
 msgstr "Message transféré de %s"
 
-#: lib/MIME/Viewer/itip.php:436
+#: lib/MIME/Viewer/itip.php:437
 msgid "Free/Busy Request Response"
 msgstr "Réponse à la requête sur les disponibilités"
 
@@ -2015,8 +2015,8 @@ msgstr "Options g
 msgid "Get only new messages? (IMAP only)"
 msgstr "Ne recevoir que les nouveaux messages ? (IMAP seulement)"
 
-#: folders.php:374 lib/MIME/Viewer/itip.php:602 lib/MIME/Viewer/itip.php:812
-#: lib/MIME/Viewer/itip.php:943
+#: folders.php:374 lib/MIME/Viewer/itip.php:650 lib/MIME/Viewer/itip.php:860
+#: lib/MIME/Viewer/itip.php:991
 msgid "Go"
 msgstr "Aller"
 
@@ -2050,7 +2050,7 @@ msgstr "HTML"
 msgid "HTML Version of Message"
 msgstr "Version HTML du message"
 
-#: message.php:618
+#: message.php:619
 msgid "Headers"
 msgstr "En-têtes"
 
@@ -2086,7 +2086,7 @@ msgstr "Cacher les messages supprim
 msgid "Hide Unsubscribed"
 msgstr "Souscrits seulement"
 
-#: compose.php:1040
+#: compose.php:1041
 msgid "High"
 msgstr "Haute"
 
@@ -2094,7 +2094,7 @@ msgstr "Haute"
 msgid "High Priority"
 msgstr "Priorité élevée"
 
-#: compose.php:1039
+#: compose.php:1040
 msgid "Highest"
 msgstr "La plus élevée"
 
@@ -2124,6 +2124,10 @@ msgstr "IMAP"
 msgid "IMAP (Auto Detect Protocols)"
 msgstr "IMAP (détecter automatiquement les protocoles)"
 
+#: lib/IMAP.php:315
+msgid "IMAP (self-signed certificate)"
+msgstr "IMAP (certificat auto-signé)"
+
 #: lib/IMAP/Client.php:200
 #, php-format
 msgid "IMAP Server closed the connection. Server Responded: %s"
@@ -2137,10 +2141,6 @@ msgstr "IMAP sur SSL"
 msgid "IMAP over SSL (self-signed certificate)"
 msgstr "IMAP sur SSL (certificat maison) "
 
-#: lib/IMAP.php:315
-msgid "IMAP, (self-signed certificate)"
-msgstr "IMAP sur SSL auto-signé"
-
 #: lib/IMAP.php:321
 msgid "IMAP, no TLS"
 msgstr "IMAP, sans TLS"
@@ -2236,16 +2236,12 @@ msgstr "Importer un fichier mbox"
 msgid "Import mbox file"
 msgstr "Importer le fichier mbox"
 
-#: templates/mailbox/navbar.html:16
-msgid "Important"
-msgstr "Haute importance"
-
 #: folders.php:150
 #, php-format
 msgid "Imported %d messages from %s."
 msgstr "%d messages importés à partir de %s."
 
-#: pgp.php:174
+#: pgp.php:179
 msgid ""
 "Imported key contains your PGP private key. Only add your public key in the "
 "first step!"
@@ -2253,12 +2249,13 @@ msgstr ""
 "Clé privé PGP importée. Ajoutez seulement votre clé public dans l'étape "
 "suivante !"
 
-#: lib/MIME/Viewer/itip.php:981
+#: lib/MIME/Viewer/itip.php:1029
 msgid "In Process"
 msgstr "En cours"
 
-#: lib/api.php:293 lib/Folder.php:68 lib/IMP.php:732 lib/IMAP/Tree.php:396
-#: lib/IMAP/Tree.php:1921 templates/prefs/initialpageselect.inc:4
+#: lib/api.php:293 lib/Folder.php:68 lib/IMP.php:732 lib/IMP.php:742
+#: lib/IMAP/Tree.php:410 lib/IMAP/Tree.php:1975
+#: templates/prefs/initialpageselect.inc:4
 msgid "Inbox"
 msgstr "Boîte de réception"
 
@@ -2282,16 +2279,16 @@ msgstr "Augmenter l'indentation"
 msgid "Info"
 msgstr "Info"
 
-#: pgp.php:413 smime.php:314
+#: pgp.php:418 smime.php:319
 #, php-format
 msgid "Information on %s Public Key"
 msgstr "Information sur la clef publique %s"
 
-#: pgp.php:442
+#: pgp.php:449
 msgid "Information on Personal Private Key"
 msgstr "Information sur la clef privée personnelle"
 
-#: pgp.php:436 smime.php:337
+#: pgp.php:443 smime.php:344
 msgid "Information on Personal Public Key"
 msgstr "Information sur la clef publique personnelle"
 
@@ -2324,7 +2321,7 @@ msgstr "Ins
 msgid "Insert/Overwrite"
 msgstr "Insérer/Remplacer"
 
-#: lib/MIME/Viewer/itip.php:449
+#: lib/MIME/Viewer/itip.php:451
 msgid "Invalid Action selected for this component."
 msgstr "Sélection d'une action invalide pour ce composant."
 
@@ -2351,7 +2348,7 @@ msgstr "Caract
 msgid "Invalid hostname."
 msgstr "Nom d'hôte invalide."
 
-#: pgp.php:18 smime.php:96
+#: pgp.php:18 smime.php:101
 msgid "Invalid key"
 msgstr "Clef invalide"
 
@@ -2359,11 +2356,11 @@ msgstr "Clef invalide"
 msgid "Invalid message, cannot resume draft."
 msgstr "Message invalide, impossible de reprendre le brouillon."
 
-#: pgp.php:210
+#: pgp.php:215
 msgid "Invalid personal PGP private key."
 msgstr "Clef privée PGP personnelle invalide."
 
-#: pgp.php:186
+#: pgp.php:191
 msgid "Invalid personal PGP public key."
 msgstr "Clef publique PGP personnelle invalide."
 
@@ -2399,7 +2396,7 @@ msgstr "Ko"
 msgid "Key Length:"
 msgstr "Longueur de la clef :"
 
-#: pgp.php:456
+#: pgp.php:463
 msgid ""
 "Key generation may take a long time to complete.  Continue with key "
 "generation?"
@@ -2420,7 +2417,7 @@ msgstr ""
 "Importation de la clef non disponible. Vous n'avez pas défini de carnet "
 "d'adresses où ajouter vos contacts."
 
-#: pgp.php:350
+#: pgp.php:355
 msgid "Key successfully sent to the public keyserver."
 msgstr "La clef a bien été envoyée au serveur de clefs public."
 
@@ -2440,7 +2437,7 @@ msgstr "Derni
 msgid "Last Page"
 msgstr "Dernière page"
 
-#: compose.php:1192
+#: compose.php:1193
 msgid "Link Attachments?"
 msgstr "Lier les pièces jointes ?"
 
@@ -2469,7 +2466,7 @@ msgstr ""
 msgid "Listing in the Header"
 msgstr "Liste dans les en-têtes"
 
-#: compose.php:811
+#: compose.php:812
 msgid "Loading..."
 msgstr "Chargement..."
 
@@ -2477,7 +2474,7 @@ msgstr "Chargement..."
 msgid "Local Mailbox:"
 msgstr "Boîte locale :"
 
-#: lib/MIME/Viewer/itip.php:756
+#: lib/MIME/Viewer/itip.php:804
 msgid "Location"
 msgstr "Lieu"
 
@@ -2498,7 +2495,7 @@ msgstr "Connexion"
 msgid "Login Tasks"
 msgstr "Tâches de connexion"
 
-#: compose.php:1042
+#: compose.php:1043
 msgid "Low"
 msgstr "Faible"
 
@@ -2506,7 +2503,7 @@ msgstr "Faible"
 msgid "Low Priority"
 msgstr "Priorité faible"
 
-#: compose.php:1043
+#: compose.php:1044
 msgid "Lowest"
 msgstr "La plus basse"
 
@@ -2522,7 +2519,7 @@ msgstr "Pr
 msgid "Mail server type to connect to:"
 msgstr "Type de serveur auquel se connecter :"
 
-#: lib/IMAP/Tree.php:1928 lib/IMAP/Tree.php:1955
+#: lib/IMAP/Tree.php:1982 lib/IMAP/Tree.php:2009
 msgid "Mailbox"
 msgstr "Boîte de courrier"
 
@@ -2639,7 +2636,7 @@ msgstr "Rechercher un message"
 msgid "Message Size"
 msgstr "Taille du message"
 
-#: message.php:588
+#: message.php:589
 msgid "Message Source"
 msgstr "Source du message"
 
@@ -2664,7 +2661,7 @@ msgstr "Le message est chiffr
 msgid "Message is signed"
 msgstr "Le message est signé"
 
-#: compose.php:389 compose.php:396
+#: compose.php:390 compose.php:397
 msgid "Message redirected successfully."
 msgstr "Le message a bien été redirigé."
 
@@ -2673,7 +2670,7 @@ msgstr "Le message a bien 
 msgid "Message sent successfully, but not saved to %s"
 msgstr "Message bien envoyé, mais non enregistré dans %s"
 
-#: compose.php:460 compose.php:468
+#: compose.php:461 compose.php:469
 msgid "Message sent successfully."
 msgstr "Le message a bien été envoyé."
 
@@ -2701,7 +2698,7 @@ msgstr "Mode:"
 msgid "Month"
 msgstr "Mois"
 
-#: message.php:518 message.php:706 mailbox.php:485 mailbox.php:892
+#: message.php:519 message.php:706 mailbox.php:485 mailbox.php:894
 msgid "Move"
 msgstr "Déplacer"
 
@@ -2715,7 +2712,7 @@ msgstr ""
 "Déplacer les pourriels vers le dossier de spam et les messages légitimes "
 "vers la boîte de réception"
 
-#: message.php:518 message.php:706 mailbox.php:485 mailbox.php:892
+#: message.php:519 message.php:706 mailbox.php:485 mailbox.php:894
 msgid "Move to folder"
 msgstr "Vers le dossier"
 
@@ -2740,15 +2737,15 @@ msgstr "Affichage des messages multiples:"
 msgid "NOTE:"
 msgstr "NOTE :"
 
-#: lib/MIME/Viewer/itip.php:762 lib/MIME/Viewer/itip.php:894
+#: lib/MIME/Viewer/itip.php:810 lib/MIME/Viewer/itip.php:942
 msgid "Name"
 msgstr "Nom"
 
-#: pgp.php:115
+#: pgp.php:120
 msgid "Name and/or email cannot be empty"
 msgstr "Le nom et/ou l'adresse ne peuvent pas être vides"
 
-#: lib/MIME/Viewer/itip.php:986
+#: lib/MIME/Viewer/itip.php:1034
 msgid "Needs Action"
 msgstr "Attente d'action"
 
@@ -2768,16 +2765,16 @@ msgstr "Nouveau dossier"
 msgid "New Mail"
 msgstr "Nouveau courrier"
 
-#: compose.php:33 compose.php:251 lib/Block/tree_folders.php:35
+#: compose.php:33 compose.php:252 lib/Block/tree_folders.php:35
 msgid "New Message"
 msgstr "Nouveau message"
 
-#: mailbox.php:852 lib/MIME/Headers.php:212 lib/MIME/Headers.php:235
+#: mailbox.php:854 lib/MIME/Headers.php:212 lib/MIME/Headers.php:235
 #, php-format
 msgid "New Message to %s"
 msgstr "Nouveau message pour %s"
 
-#: message.php:534
+#: message.php:535
 msgid "Next Message"
 msgstr "Message suivant"
 
@@ -2791,11 +2788,11 @@ msgstr "Page suivante"
 msgid "No"
 msgstr "Non"
 
-#: smime.php:241
+#: smime.php:246
 msgid "No Certificate found"
 msgstr "Aucun certificat trouvé"
 
-#: lib/IMP.php:1444
+#: lib/IMP.php:1447
 msgid "No Encryption"
 msgstr "Aucun chiffrement"
 
@@ -2808,15 +2805,15 @@ msgstr "Aucune clef dans l'anneau"
 msgid "No Messages"
 msgstr "Pas de messages"
 
-#: pgp.php:142
+#: pgp.php:147
 msgid "No PGP public key imported."
 msgstr "Aucune clef publique PGP n'a été importée."
 
-#: mailbox.php:813
+#: mailbox.php:815
 msgid "No Preview Text"
 msgstr "Pas de pré-visualisation"
 
-#: smime.php:166
+#: smime.php:171
 msgid "No S/MIME public key imported."
 msgstr "Aucune clef publique S/MIME importée."
 
@@ -2852,7 +2849,7 @@ msgstr "Aucun dossier avec de nouveaux messages"
 msgid "No folders with unseen messages"
 msgstr "Aucun dossier avec des messages non-lus"
 
-#: lib/IMP.php:1045
+#: lib/IMP.php:1048
 msgid "No limit"
 msgstr "Pas de limitation"
 
@@ -2868,15 +2865,15 @@ msgstr "Aucun message retourn
 msgid "No messages matched your search."
 msgstr "Aucun message ne correspond à votre recherche."
 
-#: pgp.php:215
+#: pgp.php:220
 msgid "No personal PGP private key imported."
 msgstr "Aucune clef privée PGP n'a été importée."
 
-#: pgp.php:191
+#: pgp.php:196
 msgid "No personal PGP public key imported."
 msgstr "Aucune clef publique PGP n'a été importée."
 
-#: smime.php:216
+#: smime.php:221
 msgid "No personal S/MIME certificates imported."
 msgstr "Aucun certificat personnel S/MIME importé."
 
@@ -2895,18 +2892,18 @@ msgstr "Aucune m
 msgid "No user specified."
 msgstr "Aucun utilisateur spécifié."
 
-#: lib/MIME/Viewer/itip.php:783 lib/MIME/Viewer/itip.php:915
+#: lib/MIME/Viewer/itip.php:831 lib/MIME/Viewer/itip.php:963
 msgid "Non Participant"
 msgstr "Non-participant"
 
-#: lib/MIME/Viewer/itip.php:746 lib/MIME/Viewer/itip.php:877
+#: lib/MIME/Viewer/itip.php:794 lib/MIME/Viewer/itip.php:925
 #: templates/prefs/trashselect.inc:23 templates/prefs/folderselect.inc:21
 #: templates/prefs/sourceselect.inc:35 templates/prefs/sentmailselect.inc:38
 #: templates/prefs/spamselect.inc:20 templates/mailbox/navbar.html:11
 msgid "None"
 msgstr "Aucun"
 
-#: compose.php:1041
+#: compose.php:1042
 msgid "Normal"
 msgstr "Normal"
 
@@ -2919,14 +2916,11 @@ msgstr "Non supprim
 msgid "Not Draft"
 msgstr "N'est pas un brouillon"
 
-#: templates/message/navbar_navigate.html:11 templates/mailbox/navbar.html:33
+#: templates/message/navbar_navigate.html:11 templates/mailbox/navbar.html:17
+#: templates/mailbox/navbar.html:33
 msgid "Not Flagged"
 msgstr "Non marqué"
 
-#: templates/mailbox/navbar.html:17
-msgid "Not Important"
-msgstr "Peu important"
-
 #: templates/mailbox/navbar.html:25
 msgid "Not Personal"
 msgstr "Non personnel"
@@ -2947,7 +2941,7 @@ msgstr "Notez que cela peut prendre un certain temps"
 msgid "Notepads"
 msgstr "Bloc-notes"
 
-#: config/hooks.php.dist:471
+#: config/hooks.php.dist:481
 msgid "Notes"
 msgstr "Notes"
 
@@ -2992,19 +2986,19 @@ msgstr "Afficher les dossiers avec des messages non-lus seulement
 msgid "Only one folder should be selected for this action."
 msgstr "Vous ne pouvez sélectionner qu'un seul dossier pour cette action."
 
-#: lib/IMP.php:924 lib/IMP.php:929
+#: lib/IMP.php:927 lib/IMP.php:932
 msgid "Open Fo_lder"
 msgstr "Ouvrir _le dossier"
 
-#: lib/IMP.php:929
+#: lib/IMP.php:932
 msgid "Open Folder"
 msgstr "Ouvrir le dossier"
 
-#: lib/IMAP/Tree.php:1979
+#: lib/IMAP/Tree.php:2033
 msgid "Opened Folder"
 msgstr "Dossier ouvert"
 
-#: lib/MIME/Viewer/itip.php:779 lib/MIME/Viewer/itip.php:911
+#: lib/MIME/Viewer/itip.php:827 lib/MIME/Viewer/itip.php:959
 msgid "Optional Participant"
 msgstr "Participant facultatif"
 
@@ -3022,7 +3016,7 @@ msgstr "Autres comptes de courrier"
 msgid "Other Options"
 msgstr "Autres options"
 
-#: lib/IMAP/Tree.php:71
+#: lib/IMAP/Tree.php:72
 msgid "Other Users' Folders"
 msgstr "Dossiers des autres utilisateurs"
 
@@ -3035,11 +3029,11 @@ msgstr "Serveur distant"
 msgid "PGP"
 msgstr "PGP"
 
-#: lib/IMP.php:1447
+#: lib/IMP.php:1450
 msgid "PGP Encrypt Message"
 msgstr "Chiffrer le message avec PGP"
 
-#: lib/IMP.php:1452
+#: lib/IMP.php:1455
 msgid "PGP Encrypt Message with passphrase"
 msgstr "Chiffrer le message avec la phrase secrète PGP"
 
@@ -3061,12 +3055,12 @@ msgstr ""
 "Le support de la paire de clefs personnelles requiert une connexion au web "
 "sécurisée."
 
-#: pgp.php:154
+#: pgp.php:159
 #, php-format
 msgid "PGP Public Key for \"%s (%s)\" was successfully added."
 msgstr "La clef publique PGP de « %s (%s) » a bien été ajoutée."
 
-#: pgp.php:257
+#: pgp.php:262
 #, php-format
 msgid "PGP Public Key for \"%s\" was successfully deleted."
 msgstr "La clef publique PGP de « %s » a bien été supprimée."
@@ -3075,19 +3069,19 @@ msgstr "La clef publique PGP de 
 msgid "PGP Public Keyring"
 msgstr "Anneau de clefs publiques PGP"
 
-#: lib/IMP.php:1448
+#: lib/IMP.php:1451
 msgid "PGP Sign Message"
 msgstr "Signer le message avec PGP"
 
-#: lib/IMP.php:1449
+#: lib/IMP.php:1452
 msgid "PGP Sign/Encrypt Message"
 msgstr "Signer/chiffrer le message avec PGP"
 
-#: lib/IMP.php:1453
+#: lib/IMP.php:1456
 msgid "PGP Sign/Encrypt Message with passphrase"
 msgstr "Signer/chiffrer le message avec la phrase secrète PGP"
 
-#: compose.php:731
+#: compose.php:732
 msgid ""
 "PGP encryption cannot be used by default as public keys cannot be found for "
 "all recipients."
@@ -3095,11 +3089,11 @@ msgstr ""
 "Le chiffrement PGP ne peut pas être utilisé par défaut car les clefs "
 "publiques n'ont pas été trouvées pour tous les destinataires."
 
-#: pgp.php:205
+#: pgp.php:210
 msgid "PGP private key successfully added."
 msgstr "La clef PGP privée a bien été ajoutée."
 
-#: pgp.php:180
+#: pgp.php:185
 msgid "PGP public key successfully added."
 msgstr "La clef PGP publique a bien été ajoutée."
 
@@ -3134,6 +3128,10 @@ msgstr "POP3"
 msgid "POP3 (Auto Detect Protocols)"
 msgstr "POP3 (détecter automatiquement les protocoles)"
 
+#: lib/IMAP.php:285
+msgid "POP3 (self-signed certificate)"
+msgstr "POP3 (certificat auto-signé)"
+
 #: lib/IMAP.php:297
 msgid "POP3 over SSL"
 msgstr "POP3 sur SSL"
@@ -3142,10 +3140,6 @@ msgstr "POP3 sur SSL"
 msgid "POP3 over SSL (self-signed certificate)"
 msgstr "POP3 sur SSL (certificat maison) "
 
-#: lib/IMAP.php:285
-msgid "POP3, (self-signed certificate)"
-msgstr "POP3 sur SSL auto-signé"
-
 #: lib/IMAP.php:291
 msgid "POP3, no TLS"
 msgstr "POP3, sans TLS"
@@ -3175,7 +3169,7 @@ msgstr "Partie(s)"
 msgid "Passphrase (Again):"
 msgstr "Phrase secrète (à nouveau) :"
 
-#: pgp.php:342 smime.php:250
+#: pgp.php:347 smime.php:255
 msgid "Passphrase successfully unloaded."
 msgstr "La phrase secrète a bien été déchargée."
 
@@ -3184,11 +3178,11 @@ msgstr "La phrase secr
 msgid "Passphrase:"
 msgstr "Phrase secrète :"
 
-#: pgp.php:117
+#: pgp.php:122
 msgid "Passphrases cannot be empty"
 msgstr "La phrase secrète ne doit pas être vide"
 
-#: pgp.php:119
+#: pgp.php:124
 msgid "Passphrases do not match"
 msgstr "Les phrases secrètes diffèrent"
 
@@ -3217,19 +3211,19 @@ msgstr "Personnel"
 msgid "Personal Information"
 msgstr "Données personnelles"
 
-#: pgp.php:125
+#: pgp.php:130
 msgid "Personal PGP keypair generated successfully."
 msgstr "Votre paire de clefs PGP personnelle a bien été générée."
 
-#: pgp.php:132
+#: pgp.php:137
 msgid "Personal PGP keys deleted successfully."
 msgstr "Vos clefs PGP personnelles ont bien été supprimées."
 
-#: smime.php:222
+#: smime.php:227
 msgid "Personal S/MIME certificates NOT imported: "
 msgstr "Certificats personnels S/MIME NON importés : "
 
-#: smime.php:147
+#: smime.php:152
 msgid "Personal S/MIME keys deleted successfully."
 msgstr "Vos clefs S/MIME personnelles ont bien été supprimées."
 
@@ -3341,19 +3335,19 @@ msgstr "Propuls
 msgid "Precede your signature with dashes ('-- ')?"
 msgstr "Faire précéder votre signature de tirets ('-- ') ?"
 
-#: config/hooks.php.dist:487
+#: config/hooks.php.dist:497
 msgid "Preferences"
 msgstr "Préférences"
 
-#: pgp.php:266 filterprefs.php:53 smime.php:257
+#: pgp.php:271 filterprefs.php:53 smime.php:262
 msgid "Preferences successfully updated."
 msgstr "Les préférences ont bien été mises à jour."
 
-#: compose.php:1212
+#: compose.php:1213
 msgid "Preview"
 msgstr "Pré-visualisation"
 
-#: message.php:527
+#: message.php:528
 msgid "Previous Message"
 msgstr "Message précédent"
 
@@ -3361,7 +3355,7 @@ msgstr "Message pr
 msgid "Previous Page"
 msgstr "Page précédente"
 
-#: message.php:602
+#: message.php:603
 msgid "Print"
 msgstr "Imprimer"
 
@@ -3373,7 +3367,7 @@ msgstr "Imprimer le document"
 msgid "Printed By"
 msgstr "Imprimé par"
 
-#: message.php:670 lib/MIME/Viewer/itip.php:870
+#: message.php:671 lib/MIME/Viewer/itip.php:918
 msgid "Priority"
 msgstr "Priorité"
 
@@ -3492,7 +3486,7 @@ msgstr "
 msgid "Quota status: %.2f MB / NO LIMIT"
 msgstr "État du quota : %.2f Mo /aucune limite"
 
-#: lib/IMP.php:1043
+#: lib/IMP.php:1046
 #, php-format
 msgid "Quota status: NO LIMIT"
 msgstr "État du quota : aucune limite"
@@ -3518,11 +3512,11 @@ msgstr "Recherches r
 msgid "Recent Searches:"
 msgstr "Recherches récentes :"
 
-#: message.php:572 message.php:616
+#: message.php:573 message.php:617
 msgid "Redirec_t"
 msgstr "Rediri_ger"
 
-#: message.php:572 message.php:616
+#: message.php:573 message.php:617
 msgid "Redirect"
 msgstr "Rediriger"
 
@@ -3530,7 +3524,7 @@ msgstr "Rediriger"
 msgid "Redirect Message"
 msgstr "Rediriger le message"
 
-#: compose.php:375
+#: compose.php:376
 msgid "Redirect this message"
 msgstr "Rediriger ce message"
 
@@ -3554,7 +3548,7 @@ msgstr "Recharger"
 msgid "Reload View"
 msgstr "Recharger"
 
-#: lib/MIME/Viewer/itip.php:576 lib/MIME/Viewer/itip.php:595
+#: lib/MIME/Viewer/itip.php:624 lib/MIME/Viewer/itip.php:643
 msgid "Remember the free/busy information."
 msgstr "Se souvenir des disponibilités."
 
@@ -3591,32 +3585,32 @@ msgstr "Renommer le dossier des messages envoy
 msgid "Renaming \"%s\" to \"%s\" failed. This is what the server said"
 msgstr "Le changement de nom de « %s » en « %s » a échoué. Le serveur a répondu"
 
-#: message.php:556
+#: message.php:557
 msgid "Reply"
 msgstr "Répondre"
 
-#: lib/MIME/Viewer/itip.php:341 lib/MIME/Viewer/itip.php:446
+#: lib/MIME/Viewer/itip.php:342 lib/MIME/Viewer/itip.php:448
 msgid "Reply Sent."
 msgstr "Réponse envoyée."
 
-#: compose.php:344
+#: compose.php:345
 msgid "Reply to All:"
 msgstr "Répondre à tous :"
 
-#: compose.php:346
+#: compose.php:347
 msgid "Reply to List:"
 msgstr "Répondre à la liste :"
 
-#: lib/MIME/Viewer/itip.php:578 lib/MIME/Viewer/itip.php:587
-#: lib/MIME/Viewer/itip.php:597
+#: lib/MIME/Viewer/itip.php:626 lib/MIME/Viewer/itip.php:635
+#: lib/MIME/Viewer/itip.php:645
 msgid "Reply with Not Supported Message"
 msgstr "Renvoyer un message « Non supporté »"
 
-#: lib/MIME/Viewer/itip.php:585
+#: lib/MIME/Viewer/itip.php:633
 msgid "Reply with free/busy for next 2 months."
 msgstr "Répondre avec les disponibilités des 2 prochains mois."
 
-#: lib/MIME/Viewer/itip.php:584
+#: lib/MIME/Viewer/itip.php:632
 msgid "Reply with requested free/busy information."
 msgstr "Répondre avec les disponibilités demandées."
 
@@ -3628,19 +3622,19 @@ msgstr "R
 msgid "Reply-To: "
 msgstr "Répondre à : "
 
-#: compose.php:342
+#: compose.php:343
 msgid "Reply:"
 msgstr "Répondre :"
 
-#: message.php:613 mailbox.php:544
+#: message.php:614 mailbox.php:544
 msgid "Report as Innocent"
 msgstr "Déclarer légitime"
 
-#: message.php:607 mailbox.php:538
+#: message.php:608 mailbox.php:538
 msgid "Report as Spam"
 msgstr "Déclarer comme pourriel"
 
-#: compose.php:1133
+#: compose.php:1134
 msgid "Request a _Read Receipt"
 msgstr "Demander un accusé de _lecture"
 
@@ -3652,7 +3646,7 @@ msgstr "Demander des accus
 msgid "Requested message not found."
 msgstr "Message demandé non trouvé."
 
-#: lib/MIME/Viewer/itip.php:771 lib/MIME/Viewer/itip.php:903
+#: lib/MIME/Viewer/itip.php:819 lib/MIME/Viewer/itip.php:951
 msgid "Required Participant"
 msgstr "Participant indispensable"
 
@@ -3665,7 +3659,7 @@ msgstr "R
 msgid "Respondent Status Updated."
 msgstr "Le statut du correspondant a été modifié."
 
-#: message.php:595
+#: message.php:596
 msgid "Resume"
 msgstr "Reprendre"
 
@@ -3708,7 +3702,7 @@ msgstr ""
 msgid "Rights for user \"%s\" cannot be modified."
 msgstr "Les droits de l'utilisateur « %s » ne peuvent pas être modifiés."
 
-#: lib/MIME/Viewer/itip.php:762 lib/MIME/Viewer/itip.php:894
+#: lib/MIME/Viewer/itip.php:810 lib/MIME/Viewer/itip.php:942
 msgid "Role"
 msgstr "Rôle"
 
@@ -3717,7 +3711,7 @@ msgstr "R
 msgid "S/MIME"
 msgstr "S/MIME"
 
-#: lib/IMP.php:1457
+#: lib/IMP.php:1460
 msgid "S/MIME Encrypt Message"
 msgstr "Chiffrer le message en S/MIME"
 
@@ -3745,12 +3739,12 @@ msgstr ""
 "Le support de la paire de clefs S/MIME personnelle requiert une connexion au "
 "web sécurisée."
 
-#: smime.php:155
+#: smime.php:160
 #, php-format
 msgid "S/MIME Public Key for \"%s\" was successfully deleted."
 msgstr "La clef publique S/MIME de « %s » a bien été supprimée."
 
-#: smime.php:177
+#: smime.php:182
 msgid "S/MIME Public Key successfully added."
 msgstr "La clé publique S/MIME a bien été ajoutée."
 
@@ -3758,15 +3752,15 @@ msgstr "La cl
 msgid "S/MIME Public Keyring"
 msgstr "Anneau de clefs publiques S/MIME"
 
-#: smime.php:226
+#: smime.php:231
 msgid "S/MIME Public/Private Keypair successfully added."
 msgstr "La paire de clefs S/MIME publique/privée a bien été ajoutée."
 
-#: lib/IMP.php:1458
+#: lib/IMP.php:1461
 msgid "S/MIME Sign Message"
 msgstr "Signer le message en S/MIME"
 
-#: lib/IMP.php:1459
+#: lib/IMP.php:1462
 msgid "S/MIME Sign/Encrypt Message"
 msgstr "Signer/chiffrer le message en S/MIME"
 
@@ -3820,15 +3814,15 @@ msgstr "SMTP"
 msgid "SMTP Port"
 msgstr "Port SMTP"
 
-#: compose.php:1016
+#: compose.php:1017
 msgid "S_ubject"
 msgstr "O_bjet"
 
-#: compose.php:1112
+#: compose.php:1113
 msgid "Sa_ve a copy in "
 msgstr "Enre_gistrer une copie dans "
 
-#: message.php:599
+#: message.php:600
 msgid "Sa_ve as"
 msgstr "En_registrer sous"
 
@@ -3838,7 +3832,7 @@ msgstr "En_registrer sous"
 msgid "Save"
 msgstr "Enregistrer"
 
-#: compose.php:1188
+#: compose.php:1189
 msgid "Save Attachments with message in sent-mail folder?"
 msgstr ""
 "Sauvegarder les pièces jointes avec le message dans le dossier du courrier "
@@ -3866,11 +3860,11 @@ msgstr "Enregistrer les options"
 msgid "Save Stationery"
 msgstr "Enregistrer la papeterie"
 
-#: compose.php:929
+#: compose.php:930
 msgid "Save _Draft"
 msgstr "Enregistrer le _brouillon"
 
-#: message.php:599 config/prefs.php.dist:655
+#: message.php:600 config/prefs.php.dist:655
 msgid "Save as"
 msgstr "Enregistrer sous"
 
@@ -4028,11 +4022,11 @@ msgstr "Carnets d'adresses s
 msgid "Selected Addresses"
 msgstr "Adresses sélectionnées :"
 
-#: pgp.php:437 templates/pgp/pgp.html:75
+#: pgp.php:444 templates/pgp/pgp.html:75
 msgid "Send Key to Public Keyserver"
 msgstr "Envoyer la clef au serveur public"
 
-#: lib/MIME/Viewer/itip.php:683
+#: lib/MIME/Viewer/itip.php:731
 msgid "Send Latest Information"
 msgstr "Envoyer l'information la plus récente"
 
@@ -4048,7 +4042,7 @@ msgstr "Envoyer le message sans objet
 msgid "Sent"
 msgstr "Envoyé"
 
-#: lib/IMAP/Tree.php:1951
+#: lib/IMAP/Tree.php:2005
 msgid "Sent mail folder"
 msgstr "Dossier du courrier envoyé"
 
@@ -4090,7 +4084,7 @@ msgstr "Partager les dossiers de courrier"
 msgid "Share your mail folders with other users."
 msgstr "Partager vos dossiers de courrier avec d'autres utilisateurs."
 
-#: lib/IMAP/Tree.php:69
+#: lib/IMAP/Tree.php:70
 msgid "Shared Folders"
 msgstr "Dossiers partagés"
 
@@ -4134,11 +4128,11 @@ msgstr ""
 msgid "Show All Folders"
 msgstr "Montrer tous les dossiers"
 
-#: message.php:623
+#: message.php:624
 msgid "Show All Headers"
 msgstr "Montrer tous les en-têtes"
 
-#: message.php:620
+#: message.php:621
 msgid "Show Common Headers"
 msgstr "Montrer les en-têtes principaux"
 
@@ -4150,7 +4144,7 @@ msgstr "Montrer les messages supprim
 msgid "Show Images?"
 msgstr "Montrer les images ?"
 
-#: message.php:626
+#: message.php:627
 msgid "Show Mailing List Information"
 msgstr "Montrer les informations sur la liste de diffusion"
 
@@ -4263,7 +4257,7 @@ msgstr "Tri selon l'adresse du destinataire"
 msgid "Spam"
 msgstr "Pourriel"
 
-#: lib/IMAP/Tree.php:1944
+#: lib/IMAP/Tree.php:1998
 msgid "Spam folder"
 msgstr "Dossier de pourriels"
 
@@ -4271,7 +4265,7 @@ msgstr "Dossier de pourriels"
 msgid "Spam folder:"
 msgstr "Dossier de pourriels :"
 
-#: compose.php:1097
+#: compose.php:1098
 msgid "Special Characters"
 msgstr "Caractères spéciaux"
 
@@ -4287,12 +4281,12 @@ msgstr "
 msgid "Split Block"
 msgstr "Scinder le bloc"
 
-#: lib/MIME/Viewer/itip.php:551 lib/MIME/Viewer/itip.php:553
-#: lib/MIME/Viewer/itip.php:727 lib/MIME/Viewer/itip.php:729
+#: lib/MIME/Viewer/itip.php:599 lib/MIME/Viewer/itip.php:601
+#: lib/MIME/Viewer/itip.php:775 lib/MIME/Viewer/itip.php:777
 msgid "Start"
 msgstr "Début"
 
-#: compose.php:1055 templates/stationery/stationery.html:8
+#: compose.php:1056 templates/stationery/stationery.html:8
 #: templates/stationery/stationery.html:12
 msgid "Stationery"
 msgstr "Papeterie"
@@ -4309,7 +4303,7 @@ msgstr "Type de papeterie
 msgid "Stationery:"
 msgstr "Papeterie :"
 
-#: lib/MIME/Viewer/itip.php:762 lib/MIME/Viewer/itip.php:894
+#: lib/MIME/Viewer/itip.php:810 lib/MIME/Viewer/itip.php:942
 msgid "Status"
 msgstr "Statut"
 
@@ -4372,8 +4366,8 @@ msgstr "R
 msgid "Sum"
 msgstr "Somme"
 
-#: lib/MIME/Viewer/itip.php:744 lib/MIME/Viewer/itip.php:746
-#: lib/MIME/Viewer/itip.php:875 lib/MIME/Viewer/itip.php:877
+#: lib/MIME/Viewer/itip.php:792 lib/MIME/Viewer/itip.php:794
+#: lib/MIME/Viewer/itip.php:923 lib/MIME/Viewer/itip.php:925
 msgid "Summary"
 msgstr "Sommaire"
 
@@ -4381,7 +4375,7 @@ msgstr "Sommaire"
 msgid "Superscript"
 msgstr "Superscript"
 
-#: compose.php:1138 compose.php:1139
+#: compose.php:1139 compose.php:1140
 msgid "Switch Composition Method"
 msgstr "Basculer les méthodes de rédaction"
 
@@ -4405,11 +4399,11 @@ msgstr "Bo
 msgid "Task Lists"
 msgstr "Listes de tâches"
 
-#: config/hooks.php.dist:463
+#: config/hooks.php.dist:473
 msgid "Tasks"
 msgstr "Tâches"
 
-#: compose.php:1143
+#: compose.php:1144
 msgid "Te_xt"
 msgstr "Te_xte"
 
@@ -4417,11 +4411,11 @@ msgstr "Te_xte"
 msgid "Tentative: "
 msgstr "Tentative : "
 
-#: lib/MIME/Viewer/itip.php:669
+#: lib/MIME/Viewer/itip.php:717
 msgid "Tentatively Accept request"
 msgstr "Demande acceptée mais à confirmer"
 
-#: lib/MIME/Viewer/itip.php:969
+#: lib/MIME/Viewer/itip.php:1017
 msgid "Tentatively Accepted"
 msgstr "Accepté mais à confirmer"
 
@@ -4522,11 +4516,11 @@ msgstr "Encodage par d
 msgid "The draft has been saved to the \"%s\" folder."
 msgstr "Le brouillon a été enregistré dans le dossier « %s »."
 
-#: lib/MIME/Viewer/itip.php:160
+#: lib/MIME/Viewer/itip.php:161
 msgid "The event was added to your calendar."
 msgstr "Cet événement a bien été ajouté à votre agenda."
 
-#: lib/MIME/Viewer/itip.php:147
+#: lib/MIME/Viewer/itip.php:148
 msgid "The event was updated in your calendar."
 msgstr "Cet événement a été ajouté à votre agenda."
 
@@ -4898,7 +4892,7 @@ msgstr ""
 msgid "There was an error importing %s."
 msgstr "Une erreur est survenue lors de l'importation de %s."
 
-#: lib/MIME/Viewer/itip.php:157
+#: lib/MIME/Viewer/itip.php:158
 msgid "There was an error importing the event:"
 msgstr "Une erreur est apparue lors de l'importation de l'événement :"
 
@@ -4936,11 +4930,11 @@ msgstr "Cette clef PGP publique a 
 
 #: lib/MIME/Viewer/itip.php:106 lib/MIME/Viewer/itip.php:120
 #: lib/MIME/Viewer/itip.php:166 lib/MIME/Viewer/itip.php:180
-#: lib/MIME/Viewer/itip.php:196 lib/MIME/Viewer/itip.php:344
+#: lib/MIME/Viewer/itip.php:196 lib/MIME/Viewer/itip.php:345
 msgid "This action is not supported."
 msgstr "Cette action n'est pas prise en compte."
 
-#: lib/MIME/Viewer/itip.php:202 lib/MIME/Viewer/itip.php:456
+#: lib/MIME/Viewer/itip.php:202 lib/MIME/Viewer/itip.php:458
 msgid "This action is not yet implemented."
 msgstr "Cette action n'est pas encore implémentée."
 
@@ -4994,7 +4988,7 @@ msgstr "Ce message a 
 msgid "This message part cannot be viewed because it is too large."
 msgstr "Cette partie du message est trop grande pour être visualisée."
 
-#: message.php:520
+#: message.php:521
 msgid "This message to"
 msgstr "Ce message à"
 
@@ -5031,7 +5025,7 @@ msgstr "Vignette du fichier PDF attach
 msgid "Thumbnail of attached image"
 msgstr "Vue réduite de l'image jointe"
 
-#: compose.php:830 mailbox.php:587 lib/Search.php:716 lib/UI/Mailbox.php:90
+#: compose.php:831 mailbox.php:587 lib/Search.php:716 lib/UI/Mailbox.php:90
 #: lib/UI/Message.php:26 templates/contacts/contacts.html:40
 #: templates/login/recompose.html:14
 msgid "To"
@@ -5041,23 +5035,23 @@ msgstr "
 msgid "To Address"
 msgstr "Adresse du destinataire"
 
-#: message.php:564
+#: message.php:565
 msgid "To All"
 msgstr "À tous"
 
-#: message.php:560
+#: message.php:561
 msgid "To List"
 msgstr "À la liste"
 
-#: message.php:557
+#: message.php:558
 msgid "To Sender"
 msgstr "À l'émetteur"
 
-#: message.php:564
+#: message.php:565
 msgid "To _All"
 msgstr "À _tous"
 
-#: message.php:560
+#: message.php:561
 msgid "To _List"
 msgstr "À la _liste"
 
@@ -5113,7 +5107,7 @@ msgstr "Traditionnel"
 msgid "Trash"
 msgstr "Corbeille"
 
-#: lib/IMAP/Tree.php:1931
+#: lib/IMAP/Tree.php:1985
 msgid "Trash folder"
 msgstr "Corbeille"
 
@@ -5121,7 +5115,11 @@ msgstr "Corbeille"
 msgid "Trash folder:"
 msgstr "Corbeille :"
 
-#: lib/Quota/sql.php:71
+#: lib/MIME/Viewer/itip.php:144
+msgid "Trying to import the event instead."
+msgstr "Essayer d'importer l'événement à la place"
+
+#: lib/Quota/sql.php:73
 msgid "Unable to connect to SQL server."
 msgstr "Connexion impossible au serveur SQL."
 
@@ -5140,7 +5138,7 @@ msgstr "Sans r
 msgid "Unanswered messages"
 msgstr "Messages sans réponses"
 
-#: message.php:551 mailbox.php:514
+#: message.php:552 mailbox.php:514
 msgid "Undelete"
 msgstr "Restaurer"
 
@@ -5172,16 +5170,16 @@ msgstr "R
 msgid "Unflagged messages"
 msgstr "Messages non marqués"
 
-#: lib/MIME/Viewer/itip.php:490
+#: lib/MIME/Viewer/itip.php:492
 #, php-format
 msgid "Unhandled component of type: %s"
 msgstr "Pas de prise en compte du composant de type : %s"
 
-#: lib/MIME/Viewer/itip.php:765
+#: lib/MIME/Viewer/itip.php:813
 msgid "Unknown"
 msgstr "Inconnu"
 
-#: lib/UI/Mailbox.php:206
+#: lib/UI/Mailbox.php:206 lib/UI/Mailbox.php:209 lib/UI/Mailbox.php:213
 msgid "Unknown Date"
 msgstr "Date inconnue"
 
@@ -5190,7 +5188,7 @@ msgstr "Date inconnue"
 msgid "Unknown IMAP response from the server. Server Responded: %s"
 msgstr "Réponse IMAP inconnue du serveur. Le serveur a répondu : %s"
 
-#: lib/MIME/Viewer/itip.php:711
+#: lib/MIME/Viewer/itip.php:759
 msgid "Unknown Meeting"
 msgstr "Réunion inconnue"
 
@@ -5198,11 +5196,11 @@ msgstr "R
 msgid "Unknown Recipient"
 msgstr "Destinataire inconnu"
 
-#: lib/MIME/Viewer/itip.php:855
+#: lib/MIME/Viewer/itip.php:903
 msgid "Unknown Task"
 msgstr "Tâche inconnue"
 
-#: pgp.php:440 smime.php:339
+#: pgp.php:447 smime.php:346
 msgid "Unload Passphrase"
 msgstr "Supprimer la phrase secrète"
 
@@ -5227,15 +5225,15 @@ msgstr "Se Se d
 msgid "Update"
 msgstr "Mettre à jour"
 
-#: lib/MIME/Viewer/itip.php:663 lib/MIME/Viewer/itip.php:703
+#: lib/MIME/Viewer/itip.php:711 lib/MIME/Viewer/itip.php:751
 msgid "Update in my calendar"
 msgstr "Mis à jour dans mon agenda"
 
-#: lib/MIME/Viewer/itip.php:690
+#: lib/MIME/Viewer/itip.php:738
 msgid "Update respondent status"
 msgstr "Modifier le statut du correspondant"
 
-#: lib/MIME/Viewer/itip.php:677
+#: lib/MIME/Viewer/itip.php:725
 msgid "Update this event on my calendar"
 msgstr "Modifier cet événement dans mon agenda"
 
@@ -5291,7 +5289,7 @@ msgstr "Voir"
 msgid "View %s"
 msgstr "Voir %s"
 
-#: pgp.php:412 smime.php:313
+#: pgp.php:417 smime.php:318
 #, php-format
 msgid "View %s Public Key"
 msgstr "Voir la clef publique %s"
@@ -5305,15 +5303,15 @@ msgstr "Voir la pi
 msgid "View Messages"
 msgstr "Voir les messages"
 
-#: pgp.php:441 smime.php:340
+#: pgp.php:448 smime.php:347
 msgid "View Personal Private Key"
 msgstr "Voir la clef privée personnelle"
 
-#: pgp.php:435 smime.php:336
+#: pgp.php:442 smime.php:343
 msgid "View Personal Public Key"
 msgstr "Voir la clef publique personnelle"
 
-#: message.php:575
+#: message.php:576
 msgid "View Thread"
 msgstr "Voir les Enfilades"
 
@@ -5325,7 +5323,7 @@ msgstr "Voir la pi
 msgid "View content in a separate window"
 msgstr "Voir le contenu dans une fenêtre séparée"
 
-#: lib/MIME/Viewer/itip.php:148 lib/MIME/Viewer/itip.php:161
+#: lib/MIME/Viewer/itip.php:149 lib/MIME/Viewer/itip.php:162
 msgid "View event"
 msgstr "Voir les événements"
 
@@ -5351,7 +5349,7 @@ msgstr "Dossier virtuel"
 msgid "Virtual Folder \"%s\" created succesfully."
 msgstr "Le dossier virtuel« %s » a été créé avec succès."
 
-#: lib/IMAP/Tree.php:65 templates/search/search.html:166
+#: lib/IMAP/Tree.php:66 templates/search/search.html:166
 msgid "Virtual Folders"
 msgstr "Dossiers virtuels"
 
@@ -5363,7 +5361,7 @@ msgstr "Une 
 msgid "Virtual INBOX"
 msgstr "Boîte de réception virtuelle"
 
-#: lib/IMAP/Tree.php:1971
+#: lib/IMAP/Tree.php:2025
 msgid "Virtual INBOX Folder"
 msgstr "Dossier de réception virtuel"
 
@@ -5371,7 +5369,7 @@ msgstr "Dossier de r
 msgid "Virtual Trash"
 msgstr "Corbeille virtuelle"
 
-#: lib/IMAP/Tree.php:1967
+#: lib/IMAP/Tree.php:2021
 msgid "Virtual Trash Folder"
 msgstr "Dossier de corbeille virtuel"
 
@@ -5452,7 +5450,7 @@ msgstr ""
 msgid "Where should the cursor be located in the compose text area by default?"
 msgstr "Où positionner le curseur par défaut dans la zone d'édition du texte ?"
 
-#: message.php:583 mailbox.php:530
+#: message.php:584 mailbox.php:530
 msgid "Whitelist"
 msgstr "Liste blanche"
 
@@ -5554,12 +5552,12 @@ msgid "You forwarded this message on %%s to the following recipients: %s."
 msgstr ""
 "Vous avez transféré ce message sur %%s aux destinataires suivants : %s."
 
-#: lib/IMP.php:1089
+#: lib/IMP.php:1092
 #, php-format
 msgid "You have %s new messages."
 msgstr "Vous avez %s nouveaux messages."
 
-#: lib/IMP.php:1089
+#: lib/IMP.php:1092
 msgid "You have 1 new message."
 msgstr "Vous avez 1 nouveau message."
 
@@ -5573,7 +5571,7 @@ msgstr ""
 "messages jusqu'à ce que vous ayez défini un dossier Corbeille dans les "
 "préférences."
 
-#: compose.php:149
+#: compose.php:150
 msgid "You have already submitted this page."
 msgstr "Vous avez déjà envoyé cette page."
 
@@ -5797,51 +5795,51 @@ msgstr "[Texte tronqu
 msgid "[View the raw key]"
 msgstr "[Voir la clef brute]"
 
-#: compose.php:965
+#: compose.php:966
 msgid "_Bcc"
 msgstr "Cc_i"
 
-#: message.php:579 mailbox.php:526
+#: message.php:580 mailbox.php:526
 msgid "_Blacklist"
 msgstr "Liste _noire"
 
-#: compose.php:962
+#: compose.php:963
 msgid "_Cc"
 msgstr "_Cc"
 
-#: message.php:553 mailbox.php:508 mailbox.php:510
+#: message.php:554 mailbox.php:508 mailbox.php:510
 msgid "_Delete"
 msgstr "_Supprimer"
 
-#: lib/IMP.php:862
+#: lib/IMP.php:865
 msgid "_Folders"
 msgstr "D_ossiers"
 
-#: compose.php:942
+#: compose.php:943
 msgid "_Identity"
 msgstr "Ide_ntité"
 
-#: lib/IMP.php:831
+#: lib/IMP.php:834
 msgid "_Inbox"
 msgstr "Boîte de récept_ion"
 
-#: lib/IMP.php:899
+#: lib/IMP.php:902
 msgid "_Log out"
 msgstr "Déconne_xion"
 
-#: message.php:588
+#: message.php:589
 msgid "_Message Source"
 msgstr "Source du _message"
 
-#: lib/IMP.php:859
+#: lib/IMP.php:862
 msgid "_New Message"
 msgstr "_Nouveau message"
 
-#: message.php:602
+#: message.php:603
 msgid "_Print"
 msgstr "Im_primer"
 
-#: compose.php:1034
+#: compose.php:1035
 msgid "_Priority"
 msgstr "_Priorité"
 
@@ -5850,15 +5848,15 @@ msgstr "_Priorit
 msgid "_Refresh %s"
 msgstr "_Rafraîchir %s"
 
-#: message.php:556
+#: message.php:557
 msgid "_Reply"
 msgstr "_Répondre"
 
-#: lib/IMP.php:864
+#: lib/IMP.php:867
 msgid "_Search"
 msgstr "Rec_herche"
 
-#: compose.php:927
+#: compose.php:928
 msgid "_Send Message"
 msgstr "Envo_yer le message"
 
@@ -5866,7 +5864,7 @@ msgstr "Envo_yer le message"
 msgid "_Thread"
 msgstr "Enfi_lade"
 
-#: compose.php:958 compose.php:960
+#: compose.php:959 compose.php:961
 msgid "_To"
 msgstr "_A"
 
@@ -5874,11 +5872,11 @@ msgstr "_A"
 msgid "_Undelete"
 msgstr "Resta_urer"
 
-#: message.php:575
+#: message.php:576
 msgid "_View Thread"
 msgstr "_Voir les Enfilades"
 
-#: message.php:583 mailbox.php:530
+#: message.php:584 mailbox.php:530
 msgid "_Whitelist"
 msgstr "Li_ste blanche"
 
@@ -5954,7 +5952,7 @@ msgstr "erreur logicielle interne"
 msgid "into folder"
 msgstr "vers le dossier"
 
-#: pgp.php:79 smime.php:39
+#: pgp.php:84 smime.php:39
 msgid "key"
 msgstr "clef"
 
diff --git a/po/imp.pot b/po/imp.pot
index f4fc343..1560b18 100644
--- a/po/imp.pot
+++ b/po/imp.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: dev at lists.horde.org\n"
-"POT-Creation-Date: 2009-04-13 11:05-0600\n"
+"POT-Creation-Date: 2009-09-12 10:09+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -16,28 +16,28 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: lib/Compose.php:1980
+#: lib/Compose.php:1984
 msgid "      Cc: "
 msgstr ""
 
-#: lib/Compose.php:1977
+#: lib/Compose.php:1981
 msgid "      To: "
 msgstr ""
 
-#: lib/Compose.php:1965
+#: lib/Compose.php:1969
 msgid "    Date: "
 msgstr ""
 
-#: lib/Compose.php:1968
+#: lib/Compose.php:1972
 msgid "    From: "
 msgstr ""
 
-#: folders.php:359 mailbox.php:357
+#: folders.php:370 mailbox.php:357
 #, php-format
 msgid " (Accesskey %s)"
 msgstr ""
 
-#: lib/Compose.php:1974
+#: lib/Compose.php:1978
 msgid " Subject: "
 msgstr ""
 
@@ -55,12 +55,12 @@ msgstr ""
 msgid "%.0f%% of %.0f MB"
 msgstr ""
 
-#: folders.php:300 folders.php:311 lib/Message.php:863
+#: folders.php:311 folders.php:322 lib/Message.php:863
 #, php-format
 msgid "%.2fMB"
 msgstr ""
 
-#: thread.php:158
+#: thread.php:162
 #, php-format
 msgid "%d Messages"
 msgstr ""
@@ -202,7 +202,7 @@ msgstr ""
 msgid "%s wishes to receive the latest information about \"%s\"."
 msgstr ""
 
-#: compose.php:1229
+#: compose.php:1233
 #, php-format
 msgid "%s%% of allowed size"
 msgstr ""
@@ -212,7 +212,7 @@ msgstr ""
 msgid "%s: %s"
 msgstr ""
 
-#: lib/Compose.php:1909
+#: lib/Compose.php:1913
 #, php-format
 msgid "%u Forwarded Messages"
 msgstr ""
@@ -339,7 +339,7 @@ msgstr ""
 msgid "Add to my calendar"
 msgstr ""
 
-#: lib/Compose.php:2954
+#: lib/Compose.php:2958
 #, php-format
 msgid "Added \"%s\" as an attachment."
 msgstr ""
@@ -377,7 +377,7 @@ msgstr ""
 msgid "Additional message error details can be viewed %s."
 msgstr ""
 
-#: compose.php:825 compose.php:1071 contacts.php:120
+#: compose.php:826 compose.php:1072 contacts.php:120
 #: templates/contacts/contacts.html:8
 msgid "Address Book"
 msgstr ""
@@ -402,7 +402,7 @@ msgid ""
 "address on a new line)</em>"
 msgstr ""
 
-#: lib/IMAP/ACL/rfc2086.php:57 lib/IMAP/ACL/rfc4314.php:59
+#: lib/IMAP/ACL/rfc4314.php:59 lib/IMAP/ACL/rfc2086.php:57
 msgid "Administer"
 msgstr ""
 
@@ -423,8 +423,8 @@ msgid ""
 "file:"
 msgstr ""
 
-#: lib/Maintenance/Task/purge_spam.php:79
 #: lib/Maintenance/Task/purge_trash.php:78
+#: lib/Maintenance/Task/purge_spam.php:79
 #, php-format
 msgid ""
 "All messages in your \"%s\" folder older than %s days will be permanently "
@@ -489,7 +489,7 @@ msgstr ""
 msgid "An unknown person"
 msgstr ""
 
-#: mailbox.php:764 message.php:477 templates/message/navbar_navigate.html:12
+#: message.php:477 mailbox.php:764 templates/message/navbar_navigate.html:12
 #: templates/mailbox/navbar.html:18 templates/mailbox/navbar.html:34
 msgid "Answered"
 msgstr ""
@@ -519,7 +519,7 @@ msgstr ""
 msgid "Apply filter rules whenever sidebar is refreshed?"
 msgstr ""
 
-#: thread.php:170
+#: thread.php:174
 msgid "Are you sure you want to delete all messages in this thread?"
 msgstr ""
 
@@ -527,11 +527,11 @@ msgstr ""
 msgid "Are you sure you want to delete this Virtual Folder Definition?"
 msgstr ""
 
-#: pgp.php:419 smime.php:320
+#: smime.php:320 pgp.php:419
 msgid "Are you sure you want to delete this public key?"
 msgstr ""
 
-#: pgp.php:451 smime.php:348
+#: smime.php:348 pgp.php:451
 msgid ""
 "Are you sure you want to delete your keypair? (This is NOT recommended!)"
 msgstr ""
@@ -588,15 +588,15 @@ msgstr ""
 msgid "Ask"
 msgstr ""
 
-#: compose.php:1167
+#: compose.php:1171
 msgid "Attach Files"
 msgstr ""
 
-#: compose.php:1156
+#: compose.php:1160
 msgid "Attach a copy of your PGP public key to the message?"
 msgstr ""
 
-#: compose.php:1161
+#: compose.php:1165
 msgid "Attach your contact information to the message?"
 msgstr ""
 
@@ -604,7 +604,7 @@ msgstr ""
 msgid "Attached File:"
 msgstr ""
 
-#: lib/Compose.php:2013 lib/Compose.php:2119
+#: lib/Compose.php:2017 lib/Compose.php:2123
 #, php-format
 msgid ""
 "Attached file \"%s\" exceeds the attachment size limits. File NOT attached."
@@ -624,7 +624,7 @@ msgstr ""
 msgid "Attachment %s deleted."
 msgstr ""
 
-#: lib/Compose.php:2642
+#: lib/Compose.php:2646
 msgid "Attachment Information"
 msgstr ""
 
@@ -632,7 +632,7 @@ msgstr ""
 msgid "Attachment stripped: Original attachment type"
 msgstr ""
 
-#: compose.php:1105 lib/Compose.php:2609 templates/compose/compose.html:252
+#: compose.php:1105 lib/Compose.php:2613 templates/compose/compose.html:252
 msgid "Attachments"
 msgstr ""
 
@@ -648,7 +648,7 @@ msgstr ""
 msgid "Auth_imp: Required IMAP extension not found."
 msgstr ""
 
-#: config/hooks.php.dist:538
+#: config/hooks.php.dist:579
 msgid "Authentication failed."
 msgstr ""
 
@@ -666,21 +666,21 @@ msgstr ""
 msgid "Awaiting Response"
 msgstr ""
 
-#: message.php:524 thread.php:137
+#: message.php:524 thread.php:141
 #, php-format
 msgid "Bac_k to %s"
 msgstr ""
 
-#: message.php:524 thread.php:137
+#: message.php:524 thread.php:141
 #, php-format
 msgid "Back to %s"
 msgstr ""
 
-#: thread.php:134
+#: thread.php:138
 msgid "Back to Multiple Message View Index"
 msgstr ""
 
-#: thread.php:132
+#: thread.php:136
 msgid "Back to Thread Display"
 msgstr ""
 
@@ -688,7 +688,7 @@ msgstr ""
 msgid "Background Color"
 msgstr ""
 
-#: lib/IMAP/Client.php:478
+#: lib/IMAP/Client.php:480
 #, php-format
 msgid "Bad login name or password."
 msgstr ""
@@ -698,13 +698,13 @@ msgstr ""
 msgid "Bad or malformed request. Server Responded: %s"
 msgstr ""
 
-#: lib/IMAP/Client.php:482
+#: lib/IMAP/Client.php:484
 #, php-format
 msgid "Bad request: %s"
 msgstr ""
 
-#: lib/Search.php:726 lib/UI/Message.php:28 templates/login/recompose.html:32
-#: templates/contacts/contacts.html:43
+#: lib/Search.php:726 lib/UI/Message.php:28
+#: templates/contacts/contacts.html:43 templates/login/recompose.html:32
 msgid "Bcc"
 msgstr ""
 
@@ -720,7 +720,7 @@ msgstr ""
 msgid "Below the message text"
 msgstr ""
 
-#: mailbox.php:526 message.php:580
+#: message.php:580 mailbox.php:526
 msgid "Blacklist"
 msgstr ""
 
@@ -756,28 +756,29 @@ msgstr ""
 msgid "Bulleted List"
 msgstr ""
 
-#: lib/IMAP/Client.php:407
+#: lib/IMAP/Client.php:409
 msgid ""
 "CRAM-MD5 or DIGEST-MD5 requires PEAR's Auth_SASL package to be installed."
 msgstr ""
 
-#: compose.php:1025
+#: compose.php:1026
 msgid "C_harset"
 msgstr ""
 
-#: search.php:279 config/hooks.php.dist:465
+#: search.php:279 config/hooks.php.dist:506
 msgid "Calendar"
 msgstr ""
 
-#: templates/smime/import_key.html:70 templates/smime/passphrase.html:24
-#: templates/saveimage/saveimage.html:20 templates/pgp/import_key.html:49
-#: templates/pgp/passphrase.html:22 templates/folders/folders_confirm.html:24
-#: templates/folders/import.html:18 templates/contacts/contacts.html:69
+#: templates/contacts/contacts.html:69
+#: templates/folders/folders_confirm.html:24 templates/folders/import.html:18
+#: templates/saveimage/saveimage.html:20 templates/smime/passphrase.html:24
+#: templates/smime/import_key.html:70 templates/pgp/passphrase.html:22
+#: templates/pgp/import_key.html:49
 msgid "Cancel"
 msgstr ""
 
-#: templates/compose/compose.html:21 templates/compose/compose.html:208
-#: templates/compose/redirect.html:84
+#: templates/compose/redirect.html:84 templates/compose/compose.html:21
+#: templates/compose/compose.html:208
 msgid "Cancel Message"
 msgstr ""
 
@@ -793,7 +794,7 @@ msgstr ""
 msgid "Cannot connect to the remote mail server: "
 msgstr ""
 
-#: lib/IMAP/Tree.php:2092
+#: lib/IMAP/Tree.php:2093
 msgid "Cannot directly create mailbox in this folder."
 msgstr ""
 
@@ -812,8 +813,8 @@ msgstr ""
 msgid "Cannot retrieve public key from cache."
 msgstr ""
 
-#: lib/Search.php:721 lib/UI/Message.php:27 templates/login/recompose.html:23
-#: templates/contacts/contacts.html:42
+#: lib/Search.php:721 lib/UI/Message.php:27
+#: templates/contacts/contacts.html:42 templates/login/recompose.html:23
 msgid "Cc"
 msgstr ""
 
@@ -851,7 +852,7 @@ msgstr ""
 msgid "Characters to display:"
 msgstr ""
 
-#: templates/mailbox/message_headers.html:13 templates/folders/actions.html:6
+#: templates/folders/actions.html:6 templates/mailbox/message_headers.html:13
 msgid "Check All/None"
 msgstr ""
 
@@ -859,7 +860,7 @@ msgstr ""
 msgid "Check Spelling"
 msgstr ""
 
-#: folders.php:372 mailbox.php:656
+#: folders.php:383 mailbox.php:656
 msgid "Check _All/None"
 msgstr ""
 
@@ -923,7 +924,7 @@ msgstr ""
 msgid "Click %s to go to %s management page."
 msgstr ""
 
-#: lib/MIME/Viewer/pkcs7.php:484
+#: lib/MIME/Viewer/pkcs7.php:487
 #, php-format
 msgid "Click %s to view the attachment in a separate window."
 msgstr ""
@@ -933,8 +934,8 @@ msgstr ""
 msgid "Click %s to view this multipart/related part in a separate window."
 msgstr ""
 
-#: lib/MIME/Viewer/pgp.php:248 lib/MIME/Viewer/pgp.php:275
-#: lib/MIME/Viewer/pkcs7.php:220
+#: lib/MIME/Viewer/pkcs7.php:220 lib/MIME/Viewer/pgp.php:248
+#: lib/MIME/Viewer/pgp.php:275
 msgid "Click HERE to verify the message."
 msgstr ""
 
@@ -957,7 +958,7 @@ msgstr ""
 msgid "Clicking on the address will open the message to be read"
 msgstr ""
 
-#: templates/newmsg/alert.html:17 templates/fetchmail/fetchmail.html:33
+#: templates/fetchmail/fetchmail.html:33 templates/newmsg/alert.html:17
 msgid "Close"
 msgstr ""
 
@@ -965,23 +966,23 @@ msgstr ""
 msgid "Close this window"
 msgstr ""
 
-#: lib/IMAP/Tree.php:2037
+#: lib/IMAP/Tree.php:2038
 msgid "Closed Folder"
 msgstr ""
 
-#: folders.php:453
+#: folders.php:464
 msgid "Collapse"
 msgstr ""
 
-#: folders.php:388
+#: folders.php:399
 msgid "Collapse All"
 msgstr ""
 
-#: folders.php:388
+#: folders.php:399
 msgid "Collapse All Folders"
 msgstr ""
 
-#: folders.php:453
+#: folders.php:464
 msgid "Collapse Folder"
 msgstr ""
 
@@ -1019,11 +1020,11 @@ msgstr ""
 msgid "Configure mail preview options."
 msgstr ""
 
-#: config/hooks.php.dist:534
+#: config/hooks.php.dist:575
 msgid "Connection to server failed."
 msgstr ""
 
-#: config/hooks.php.dist:489
+#: config/hooks.php.dist:530
 msgid "Contacts"
 msgstr ""
 
@@ -1047,7 +1048,7 @@ msgstr ""
 msgid "Convert textual emoticons into graphical ones?"
 msgstr ""
 
-#: mailbox.php:486 mailbox.php:895 message.php:520 message.php:707
+#: message.php:520 message.php:707 mailbox.php:486 mailbox.php:895
 msgid "Copy"
 msgstr ""
 
@@ -1055,11 +1056,11 @@ msgstr ""
 msgid "Copy selection"
 msgstr ""
 
-#: mailbox.php:486 mailbox.php:895 message.php:520 message.php:707
+#: message.php:520 message.php:707 mailbox.php:486 mailbox.php:895
 msgid "Copy to folder"
 msgstr ""
 
-#: lib/Compose.php:2094
+#: lib/Compose.php:2098
 #, php-format
 msgid "Could not attach %s to the message."
 msgstr ""
@@ -1079,7 +1080,7 @@ msgstr ""
 msgid "Could not delete messages from %s. The server said: %s"
 msgstr ""
 
-#: lib/Session.php:330
+#: lib/Session.php:333
 msgid "Could not execute maintenance operations."
 msgstr ""
 
@@ -1097,11 +1098,11 @@ msgid ""
 "preferences."
 msgstr ""
 
-#: lib/IMAP/Client.php:318
+#: lib/IMAP/Client.php:320
 msgid "Could not open secure connection to the IMAP server."
 msgstr ""
 
-#: lib/Session.php:286
+#: lib/Session.php:284
 msgid "Could not retrieve namespace information from IMAP server."
 msgstr ""
 
@@ -1119,8 +1120,8 @@ msgstr ""
 msgid "Could not save the compiled template file '%s'."
 msgstr ""
 
-#: templates/folders/actions.html:16
 #: templates/fetchmail/fetchmailprefs.html:121
+#: templates/folders/actions.html:16
 msgid "Create"
 msgstr ""
 
@@ -1276,15 +1277,14 @@ msgstr ""
 msgid "Delegated"
 msgstr ""
 
-#: folders.php:418 mailbox.php:508 mailbox.php:510 message.php:554
-#: lib/IMAP/ACL/rfc4314.php:57 templates/smime/smime.html:35
-#: templates/pgp/pgp.html:43 templates/folders/actions.html:19
-#: templates/fetchmail/fetchmailprefs.html:122
-#: templates/contacts/contacts.html:59
+#: folders.php:429 message.php:554 mailbox.php:508 mailbox.php:510
+#: lib/IMAP/ACL/rfc4314.php:57 templates/fetchmail/fetchmailprefs.html:122
+#: templates/contacts/contacts.html:59 templates/folders/actions.html:19
+#: templates/smime/smime.html:35 templates/pgp/pgp.html:43
 msgid "Delete"
 msgstr ""
 
-#: pgp.php:419 smime.php:320
+#: smime.php:320 pgp.php:419
 #, php-format
 msgid "Delete %s Public Key"
 msgstr ""
@@ -1305,11 +1305,11 @@ msgstr ""
 msgid "Delete Stationery"
 msgstr ""
 
-#: thread.php:170
+#: thread.php:174
 msgid "Delete Thread"
 msgstr ""
 
-#: folders.php:418
+#: folders.php:429
 msgid "Delete Virtual Folder"
 msgstr ""
 
@@ -1346,7 +1346,7 @@ msgstr ""
 msgid "Delete?"
 msgstr ""
 
-#: mailbox.php:779 message.php:480 templates/mailbox/navbar.html:20
+#: message.php:480 mailbox.php:779 templates/mailbox/navbar.html:20
 #: templates/mailbox/navbar.html:37
 msgid "Deleted"
 msgstr ""
@@ -1390,23 +1390,23 @@ msgstr ""
 msgid "Details"
 msgstr ""
 
-#: lib/Compose.php:2936
+#: lib/Compose.php:2940
 #, php-format
 msgid "Did not attach \"%s\" as it was only partially uploaded."
 msgstr ""
 
-#: lib/Compose.php:2945
+#: lib/Compose.php:2949
 #, php-format
 msgid "Did not attach \"%s\" as the file was empty."
 msgstr ""
 
-#: lib/Compose.php:2932
+#: lib/Compose.php:2936
 #, php-format
 msgid ""
 "Did not attach \"%s\" as the maximum allowed upload size has been exceeded."
 msgstr ""
 
-#: lib/Compose.php:2940
+#: lib/Compose.php:2944
 #, php-format
 msgid ""
 "Did not attach \"%s\" as the server configuration did not allow the file to "
@@ -1494,12 +1494,12 @@ msgstr ""
 msgid "Download in .zip Format"
 msgstr ""
 
-#: mailbox.php:769 message.php:478 templates/message/navbar_navigate.html:14
+#: message.php:478 mailbox.php:769 templates/message/navbar_navigate.html:14
 #: templates/mailbox/navbar.html:22 templates/mailbox/navbar.html:40
 msgid "Draft"
 msgstr ""
 
-#: lib/IMAP/Tree.php:1992
+#: lib/IMAP/Tree.php:1993
 msgid "Draft folder"
 msgstr ""
 
@@ -1527,7 +1527,7 @@ msgstr ""
 msgid "ERROR: Your message could not be delivered."
 msgstr ""
 
-#: folders.php:419 templates/stationery/stationery.html:19
+#: folders.php:430 templates/stationery/stationery.html:19
 msgid "Edit"
 msgstr ""
 
@@ -1535,7 +1535,7 @@ msgstr ""
 msgid "Edit Search Query"
 msgstr ""
 
-#: folders.php:419 templates/search/search.html:17
+#: folders.php:430 templates/search/search.html:17
 msgid "Edit Virtual Folder"
 msgstr ""
 
@@ -1601,16 +1601,11 @@ msgstr ""
 msgid "Enable message previews?"
 msgstr ""
 
-#: compose.php:1150
+#: compose.php:1153
 msgid "Encr_yption Options"
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:608 lib/MIME/Viewer/itip.php:610
-#: lib/MIME/Viewer/itip.php:784 lib/MIME/Viewer/itip.php:786
-msgid "End"
-msgstr ""
-
-#: lib/Compose.php:1813
+#: lib/Compose.php:1815
 msgid "End forwarded message"
 msgstr ""
 
@@ -1623,7 +1618,12 @@ msgstr ""
 msgid "End message from %s"
 msgstr ""
 
-#: pgp.php:447 smime.php:346
+#: lib/MIME/Viewer/itip.php:608 lib/MIME/Viewer/itip.php:610
+#: lib/MIME/Viewer/itip.php:784 lib/MIME/Viewer/itip.php:786
+msgid "End:"
+msgstr ""
+
+#: smime.php:346 pgp.php:447
 msgid "Enter Passphrase"
 msgstr ""
 
@@ -1652,12 +1652,12 @@ msgstr ""
 msgid "Entry \"%s\" was successfully added to the address book"
 msgstr ""
 
-#: lib/MIME/Viewer/pgp.php:448 lib/MIME/Viewer/pkcs7.php:441
+#: lib/MIME/Viewer/pkcs7.php:444 lib/MIME/Viewer/pgp.php:453
 #: lib/MIME/Viewer/status.php:71 lib/MIME/Viewer/status.php:162
 msgid "Error"
 msgstr ""
 
-#: lib/IMAP/Client.php:303 lib/IMAP/Client.php:323
+#: lib/IMAP/Client.php:305 lib/IMAP/Client.php:325
 #, php-format
 msgid "Error connecting to IMAP server: [%s] %s."
 msgstr ""
@@ -1699,23 +1699,23 @@ msgstr ""
 msgid "Every minute"
 msgstr ""
 
-#: folders.php:464
+#: folders.php:475
 msgid "Expand"
 msgstr ""
 
-#: folders.php:387
+#: folders.php:398
 msgid "Expand All"
 msgstr ""
 
-#: folders.php:387
+#: folders.php:398
 msgid "Expand All Folders"
 msgstr ""
 
-#: folders.php:464
+#: folders.php:475
 msgid "Expand Folder"
 msgstr ""
 
-#: compose.php:827 compose.php:1079
+#: compose.php:828 compose.php:1080
 msgid "Expand Names"
 msgstr ""
 
@@ -1811,7 +1811,7 @@ msgstr ""
 msgid "First Page"
 msgstr ""
 
-#: mailbox.php:774 message.php:479 templates/message/navbar_navigate.html:10
+#: message.php:479 mailbox.php:774 templates/message/navbar_navigate.html:10
 #: templates/mailbox/navbar.html:16 templates/mailbox/navbar.html:32
 msgid "Flagged For Followup"
 msgstr ""
@@ -1820,24 +1820,24 @@ msgstr ""
 msgid "Flagged messages"
 msgstr ""
 
-#: mailbox.php:533 message.php:568
+#: message.php:568 mailbox.php:533
 msgid "Fo_rward"
 msgstr ""
 
-#: lib/IMAP/Tree.php:2037 templates/folders/folders_size.html:6
+#: lib/IMAP/Tree.php:2038 templates/folders/folders_size.html:6
 msgid "Folder"
 msgstr ""
 
-#: folders.php:262 templates/folders/folders_confirm.html:6
+#: folders.php:273 templates/folders/folders_confirm.html:6
 msgid "Folder Actions - Confirmation"
 msgstr ""
 
-#: folders.php:325 templates/prefs/initialpageselect.inc:11
+#: folders.php:336 templates/prefs/initialpageselect.inc:11
 #: templates/folders/head.html:2
 msgid "Folder Navigator"
 msgstr ""
 
-#: folders.php:282 templates/folders/folders_size.html:1
+#: folders.php:293 templates/folders/folders_size.html:1
 msgid "Folder Sizes"
 msgstr ""
 
@@ -1861,23 +1861,23 @@ msgstr ""
 msgid "Format of message dates in the mailbox view for messages dated today"
 msgstr ""
 
-#: mailbox.php:533 message.php:568 lib/Compose.php:1796
+#: message.php:568 mailbox.php:533 lib/Compose.php:1798
 msgid "Forward"
 msgstr ""
 
-#: lib/Compose.php:1782
+#: lib/Compose.php:1784
 msgid "Forward:"
 msgstr ""
 
-#: lib/Compose.php:1895
+#: lib/Compose.php:1899
 msgid "Forwarded Message:"
 msgstr ""
 
-#: lib/Compose.php:1809
+#: lib/Compose.php:1811
 msgid "Forwarded message"
 msgstr ""
 
-#: lib/Compose.php:1807
+#: lib/Compose.php:1809
 #, php-format
 msgid "Forwarded message from %s"
 msgstr ""
@@ -1916,12 +1916,12 @@ msgstr ""
 msgid "Get only new messages? (IMAP only)"
 msgstr ""
 
-#: folders.php:374 lib/MIME/Viewer/itip.php:650 lib/MIME/Viewer/itip.php:860
+#: folders.php:385 lib/MIME/Viewer/itip.php:650 lib/MIME/Viewer/itip.php:860
 #: lib/MIME/Viewer/itip.php:991
 msgid "Go"
 msgstr ""
 
-#: thread.php:136
+#: thread.php:140
 msgid "Go to Message"
 msgstr ""
 
@@ -1935,10 +1935,10 @@ msgid "Go to address book entry of \"%s\""
 msgstr ""
 
 #: message.php:447 lib/Filter.php:130 lib/MIME/Contents.php:449
-#: lib/MIME/Viewer/appledouble.php:48 lib/MIME/Viewer/images.php:90
-#: lib/MIME/Viewer/images.php:97 lib/MIME/Viewer/images.php:99
-#: lib/MIME/Viewer/notification.php:60 lib/MIME/Viewer/notification.php:67
-#: lib/MIME/Viewer/pkcs7.php:484 lib/MIME/Viewer/related.php:85
+#: lib/MIME/Viewer/images.php:90 lib/MIME/Viewer/images.php:97
+#: lib/MIME/Viewer/images.php:99 lib/MIME/Viewer/notification.php:60
+#: lib/MIME/Viewer/notification.php:67 lib/MIME/Viewer/related.php:85
+#: lib/MIME/Viewer/pkcs7.php:487 lib/MIME/Viewer/appledouble.php:48
 #: lib/MIME/Viewer/status.php:119 lib/MIME/Viewer/status.php:128
 msgid "HERE"
 msgstr ""
@@ -1983,11 +1983,11 @@ msgstr ""
 msgid "Hide Deleted"
 msgstr ""
 
-#: folders.php:380
+#: folders.php:391
 msgid "Hide Unsubscribed"
 msgstr ""
 
-#: compose.php:1041
+#: compose.php:1042
 msgid "High"
 msgstr ""
 
@@ -1995,7 +1995,7 @@ msgstr ""
 msgid "High Priority"
 msgstr ""
 
-#: compose.php:1040
+#: compose.php:1041
 msgid "Highest"
 msgstr ""
 
@@ -2048,7 +2048,7 @@ msgstr ""
 msgid "IMAP/POP3 Mail Servers"
 msgstr ""
 
-#: lib/IMAP/Client.php:283
+#: lib/IMAP/Client.php:285
 msgid "If using SSL or TLS, you must have the PHP openssl extension loaded."
 msgstr ""
 
@@ -2147,9 +2147,9 @@ msgstr ""
 msgid "In Process"
 msgstr ""
 
-#: templates/prefs/initialpageselect.inc:4 lib/Folder.php:68 lib/IMP.php:732
-#: lib/IMP.php:742 lib/api.php:293 lib/IMAP/Tree.php:410
-#: lib/IMAP/Tree.php:1975
+#: templates/prefs/initialpageselect.inc:4 lib/Folder.php:68 lib/api.php:293
+#: lib/IMP.php:732 lib/IMP.php:742 lib/IMAP/Tree.php:410
+#: lib/IMAP/Tree.php:1976
 msgid "Inbox"
 msgstr ""
 
@@ -2173,7 +2173,7 @@ msgstr ""
 msgid "Info"
 msgstr ""
 
-#: pgp.php:418 smime.php:319
+#: smime.php:319 pgp.php:418
 #, php-format
 msgid "Information on %s Public Key"
 msgstr ""
@@ -2182,7 +2182,7 @@ msgstr ""
 msgid "Information on Personal Private Key"
 msgstr ""
 
-#: pgp.php:443 smime.php:344
+#: smime.php:344 pgp.php:443
 msgid "Information on Personal Public Key"
 msgstr ""
 
@@ -2191,7 +2191,7 @@ msgstr ""
 msgid "Inline"
 msgstr ""
 
-#: lib/IMAP/ACL/rfc2086.php:53 lib/IMAP/ACL/rfc4314.php:53
+#: lib/IMAP/ACL/rfc4314.php:53 lib/IMAP/ACL/rfc2086.php:53
 msgid "Insert"
 msgstr ""
 
@@ -2242,7 +2242,7 @@ msgstr ""
 msgid "Invalid hostname."
 msgstr ""
 
-#: pgp.php:18 smime.php:101
+#: smime.php:101 pgp.php:18
 msgid "Invalid key"
 msgstr ""
 
@@ -2326,20 +2326,20 @@ msgstr ""
 msgid "Last Page"
 msgstr ""
 
-#: compose.php:1193
+#: compose.php:1197
 msgid "Link Attachments?"
 msgstr ""
 
-#: attachment.php:35 lib/Compose.php:2600
+#: attachment.php:35 lib/Compose.php:2604
 msgid "Linked attachments are forbidden."
 msgstr ""
 
-#: lib/Compose.php:2616
+#: lib/Compose.php:2620
 #, php-format
 msgid "Links will expire on %s"
 msgstr ""
 
-#: lib/IMAP/ACL/rfc2086.php:49 lib/IMAP/ACL/rfc4314.php:49
+#: lib/IMAP/ACL/rfc4314.php:49 lib/IMAP/ACL/rfc2086.php:49
 msgid "List"
 msgstr ""
 
@@ -2353,7 +2353,7 @@ msgstr ""
 msgid "Listing in the Header"
 msgstr ""
 
-#: compose.php:812
+#: compose.php:813
 msgid "Loading..."
 msgstr ""
 
@@ -2382,7 +2382,7 @@ msgstr ""
 msgid "Login Tasks"
 msgstr ""
 
-#: compose.php:1043
+#: compose.php:1044
 msgid "Low"
 msgstr ""
 
@@ -2390,7 +2390,7 @@ msgstr ""
 msgid "Low Priority"
 msgstr ""
 
-#: compose.php:1044
+#: compose.php:1045
 msgid "Lowest"
 msgstr ""
 
@@ -2406,7 +2406,7 @@ msgstr ""
 msgid "Mail server type to connect to:"
 msgstr ""
 
-#: lib/IMAP/Tree.php:1982 lib/IMAP/Tree.php:2009
+#: lib/IMAP/Tree.php:1983 lib/IMAP/Tree.php:2010
 msgid "Mailbox"
 msgstr ""
 
@@ -2414,11 +2414,11 @@ msgstr ""
 msgid "Mailbox and Folder Display Options"
 msgstr ""
 
-#: lib/IMAP/ACL/rfc2086.php:52 lib/IMAP/ACL/rfc4314.php:52
+#: lib/IMAP/ACL/rfc4314.php:52 lib/IMAP/ACL/rfc2086.php:52
 msgid "Mark (Other)"
 msgstr ""
 
-#: lib/IMAP/ACL/rfc2086.php:51 lib/IMAP/ACL/rfc4314.php:51
+#: lib/IMAP/ACL/rfc4314.php:51 lib/IMAP/ACL/rfc2086.php:51
 msgid "Mark (Seen)"
 msgstr ""
 
@@ -2585,7 +2585,7 @@ msgstr ""
 msgid "Month"
 msgstr ""
 
-#: mailbox.php:485 mailbox.php:894 message.php:519 message.php:706
+#: message.php:519 message.php:706 mailbox.php:485 mailbox.php:894
 msgid "Move"
 msgstr ""
 
@@ -2597,7 +2597,7 @@ msgstr ""
 msgid "Move spam messages to spam folder and innocent messages to INBOX"
 msgstr ""
 
-#: mailbox.php:485 mailbox.php:894 message.php:519 message.php:706
+#: message.php:519 message.php:706 mailbox.php:485 mailbox.php:894
 msgid "Move to folder"
 msgstr ""
 
@@ -2609,7 +2609,7 @@ msgstr ""
 msgid "Multipart/alternative"
 msgstr ""
 
-#: thread.php:177
+#: thread.php:181
 msgid "Multiple Message View"
 msgstr ""
 
@@ -2617,8 +2617,8 @@ msgstr ""
 msgid "Multiple Message View:"
 msgstr ""
 
-#: templates/smime/smime.html:4 templates/pgp/pgp.html:4
-#: templates/fetchmail/fetchmailprefs.html:91
+#: templates/fetchmail/fetchmailprefs.html:91 templates/smime/smime.html:4
+#: templates/pgp/pgp.html:4
 msgid "NOTE:"
 msgstr ""
 
@@ -2677,7 +2677,7 @@ msgstr ""
 msgid "No Certificate found"
 msgstr ""
 
-#: lib/IMP.php:1447
+#: lib/IMP.php:1449
 msgid "No Encryption"
 msgstr ""
 
@@ -2685,7 +2685,7 @@ msgstr ""
 msgid "No Keys in Keyring"
 msgstr ""
 
-#: mailbox.php:267 rss.php:86
+#: rss.php:86 mailbox.php:267
 #, php-format
 msgid "No Messages"
 msgstr ""
@@ -2722,7 +2722,7 @@ msgstr ""
 msgid "No folders are being checked for new mail."
 msgstr ""
 
-#: folders.php:199 lib/Folder.php:423 lib/Folder.php:471
+#: folders.php:210 lib/Folder.php:423 lib/Folder.php:471
 msgid "No folders were specified"
 msgstr ""
 
@@ -2742,7 +2742,7 @@ msgstr ""
 msgid "No message body text"
 msgstr ""
 
-#: lib/IMAP/Client.php:474
+#: lib/IMAP/Client.php:476
 msgid "No message returned."
 msgstr ""
 
@@ -2762,12 +2762,12 @@ msgstr ""
 msgid "No personal S/MIME certificates imported."
 msgstr ""
 
-#: lib/MIME/Viewer/pkcs7.php:302
+#: lib/MIME/Viewer/pkcs7.php:305
 msgid ""
 "No personal private key exists so the message is unable to be decrypted."
 msgstr ""
 
-#: lib/IMAP/Client.php:374
+#: lib/IMAP/Client.php:376
 msgid "No supported IMAP authentication method could be found."
 msgstr ""
 
@@ -2786,7 +2786,7 @@ msgstr ""
 msgid "None"
 msgstr ""
 
-#: compose.php:1042
+#: compose.php:1043
 msgid "Normal"
 msgstr ""
 
@@ -2824,7 +2824,7 @@ msgstr ""
 msgid "Notepads"
 msgstr ""
 
-#: config/hooks.php.dist:481
+#: config/hooks.php.dist:522
 msgid "Notes"
 msgstr ""
 
@@ -2848,7 +2848,7 @@ msgstr ""
 msgid "OK"
 msgstr ""
 
-#: templates/smime/import_key.html:31 templates/search/search.html:61
+#: templates/search/search.html:61 templates/smime/import_key.html:31
 #: templates/pgp/import_key.html:30
 msgid "OR"
 msgstr ""
@@ -2873,7 +2873,7 @@ msgstr ""
 msgid "Open Folder"
 msgstr ""
 
-#: lib/IMAP/Tree.php:2033
+#: lib/IMAP/Tree.php:2034
 msgid "Opened Folder"
 msgstr ""
 
@@ -2904,15 +2904,15 @@ msgid "Outbound Server"
 msgstr ""
 
 #: pgp.php:44 lib/MIME/Viewer/pgp.php:165 lib/MIME/Viewer/pgp.php:213
-#: lib/MIME/Viewer/pgp.php:309
+#: lib/MIME/Viewer/pgp.php:314
 msgid "PGP"
 msgstr ""
 
-#: lib/IMP.php:1450
+#: lib/IMP.php:1452
 msgid "PGP Encrypt Message"
 msgstr ""
 
-#: lib/IMP.php:1455
+#: lib/IMP.php:1457
 msgid "PGP Encrypt Message with passphrase"
 msgstr ""
 
@@ -2946,19 +2946,19 @@ msgstr ""
 msgid "PGP Public Keyring"
 msgstr ""
 
-#: lib/IMP.php:1451
+#: lib/IMP.php:1453
 msgid "PGP Sign Message"
 msgstr ""
 
-#: lib/IMP.php:1452
+#: lib/IMP.php:1454
 msgid "PGP Sign/Encrypt Message"
 msgstr ""
 
-#: lib/IMP.php:1456
+#: lib/IMP.php:1458
 msgid "PGP Sign/Encrypt Message with passphrase"
 msgstr ""
 
-#: compose.php:732
+#: compose.php:733
 msgid ""
 "PGP encryption cannot be used by default as public keys cannot be found for "
 "all recipients."
@@ -3040,7 +3040,7 @@ msgstr ""
 msgid "Passphrase (Again):"
 msgstr ""
 
-#: pgp.php:347 smime.php:255
+#: smime.php:255 pgp.php:347
 msgid "Passphrase successfully unloaded."
 msgstr ""
 
@@ -3061,8 +3061,8 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
-#: templates/smime/import_key.html:54
 #: templates/fetchmail/fetchmailprefs.html:59
+#: templates/smime/import_key.html:54
 msgid "Password:"
 msgstr ""
 
@@ -3074,7 +3074,7 @@ msgstr ""
 msgid "Paste from clipboard"
 msgstr ""
 
-#: mailbox.php:752 message.php:465 templates/mailbox/navbar.html:24
+#: message.php:465 mailbox.php:752 templates/mailbox/navbar.html:24
 msgid "Personal"
 msgstr ""
 
@@ -3157,7 +3157,7 @@ msgstr ""
 msgid "Please provide your username."
 msgstr ""
 
-#: lib/Compose.php:2790 lib/UI/Compose.php:26
+#: lib/Compose.php:2794 lib/UI/Compose.php:26
 msgid "Please resolve ambiguous or invalid addresses."
 msgstr ""
 
@@ -3181,7 +3181,7 @@ msgstr ""
 msgid "Port"
 msgstr ""
 
-#: lib/IMAP/ACL/rfc2086.php:54 lib/IMAP/ACL/rfc4314.php:54
+#: lib/IMAP/ACL/rfc4314.php:54 lib/IMAP/ACL/rfc2086.php:54
 msgid "Post"
 msgstr ""
 
@@ -3193,15 +3193,15 @@ msgstr ""
 msgid "Precede your signature with dashes ('-- ')?"
 msgstr ""
 
-#: config/hooks.php.dist:497
+#: config/hooks.php.dist:538
 msgid "Preferences"
 msgstr ""
 
-#: filterprefs.php:53 pgp.php:271 smime.php:262
+#: smime.php:262 pgp.php:271 filterprefs.php:53
 msgid "Preferences successfully updated."
 msgstr ""
 
-#: compose.php:1213
+#: compose.php:1217
 msgid "Preview"
 msgstr ""
 
@@ -3253,7 +3253,7 @@ msgstr ""
 msgid "Protocol:"
 msgstr ""
 
-#: lib/Crypt/PGP.php:489
+#: lib/Crypt/PGP.php:491
 msgid "Public PGP keyserver support has been disabled."
 msgstr ""
 
@@ -3353,7 +3353,7 @@ msgstr ""
 msgid "Quoting %f:"
 msgstr ""
 
-#: lib/IMAP/ACL/rfc2086.php:50 lib/IMAP/ACL/rfc4314.php:50
+#: lib/IMAP/ACL/rfc4314.php:50 lib/IMAP/ACL/rfc2086.php:50
 msgid "Read"
 msgstr ""
 
@@ -3389,7 +3389,7 @@ msgstr ""
 msgid "Redoes your last action"
 msgstr ""
 
-#: folders.php:361
+#: folders.php:372
 msgid "Refresh"
 msgstr ""
 
@@ -3401,7 +3401,7 @@ msgstr ""
 msgid "Reload"
 msgstr ""
 
-#: folders.php:351
+#: folders.php:362
 msgid "Reload View"
 msgstr ""
 
@@ -3475,7 +3475,7 @@ msgstr ""
 msgid "Reply-To"
 msgstr ""
 
-#: lib/Compose.php:1971
+#: lib/Compose.php:1975
 msgid "Reply-To: "
 msgstr ""
 
@@ -3483,11 +3483,11 @@ msgstr ""
 msgid "Reply:"
 msgstr ""
 
-#: mailbox.php:544 message.php:614
+#: message.php:614 mailbox.php:544
 msgid "Report as Innocent"
 msgstr ""
 
-#: mailbox.php:538 message.php:608
+#: message.php:608 mailbox.php:538
 msgid "Report as Spam"
 msgstr ""
 
@@ -3561,12 +3561,12 @@ msgstr ""
 msgid "Role"
 msgstr ""
 
-#: smime.php:67 lib/MIME/Viewer/pkcs7.php:173 lib/MIME/Viewer/pkcs7.php:293
-#: lib/MIME/Viewer/pkcs7.php:485
+#: smime.php:67 lib/MIME/Viewer/pkcs7.php:173 lib/MIME/Viewer/pkcs7.php:296
+#: lib/MIME/Viewer/pkcs7.php:488
 msgid "S/MIME"
 msgstr ""
 
-#: lib/IMP.php:1460
+#: lib/IMP.php:1462
 msgid "S/MIME Encrypt Message"
 msgstr ""
 
@@ -3607,11 +3607,11 @@ msgstr ""
 msgid "S/MIME Public/Private Keypair successfully added."
 msgstr ""
 
-#: lib/IMP.php:1461
+#: lib/IMP.php:1463
 msgid "S/MIME Sign Message"
 msgstr ""
 
-#: lib/IMP.php:1462
+#: lib/IMP.php:1464
 msgid "S/MIME Sign/Encrypt Message"
 msgstr ""
 
@@ -3619,7 +3619,7 @@ msgstr ""
 msgid "S/MIME support is disabled on this system."
 msgstr ""
 
-#: lib/MIME/Viewer/pkcs7.php:297
+#: lib/MIME/Viewer/pkcs7.php:300
 msgid ""
 "S/MIME support is not currently enabled so the message is unable to be "
 "decrypted."
@@ -3656,7 +3656,7 @@ msgstr ""
 msgid "SMTP Port"
 msgstr ""
 
-#: compose.php:1017
+#: compose.php:1018
 msgid "S_ubject"
 msgstr ""
 
@@ -3668,12 +3668,12 @@ msgstr ""
 msgid "Sa_ve as"
 msgstr ""
 
-#: templates/search/search.html:25 templates/search/search.html:182
-#: templates/fetchmail/fetchmailprefs.html:121 templates/acl/acl.html:79
+#: templates/fetchmail/fetchmailprefs.html:121 templates/search/search.html:25
+#: templates/search/search.html:182 templates/acl/acl.html:79
 msgid "Save"
 msgstr ""
 
-#: compose.php:1189
+#: compose.php:1193
 msgid "Save Attachments with message in sent-mail folder?"
 msgstr ""
 
@@ -3699,7 +3699,7 @@ msgstr ""
 msgid "Save Stationery"
 msgstr ""
 
-#: compose.php:930
+#: compose.php:931
 msgid "Save _Draft"
 msgstr ""
 
@@ -3869,7 +3869,7 @@ msgstr ""
 msgid "Sent"
 msgstr ""
 
-#: lib/IMAP/Tree.php:2005
+#: lib/IMAP/Tree.php:2006
 msgid "Sent mail folder"
 msgstr ""
 
@@ -3972,7 +3972,7 @@ msgstr ""
 msgid "Show Size"
 msgstr ""
 
-#: folders.php:380
+#: folders.php:391
 msgid "Show Unsubscribed"
 msgstr ""
 
@@ -4072,7 +4072,7 @@ msgstr ""
 msgid "Spam"
 msgstr ""
 
-#: lib/IMAP/Tree.php:1998
+#: lib/IMAP/Tree.php:1999
 msgid "Spam folder"
 msgstr ""
 
@@ -4080,7 +4080,7 @@ msgstr ""
 msgid "Spam folder:"
 msgstr ""
 
-#: compose.php:1098
+#: compose.php:1099
 msgid "Special Characters"
 msgstr ""
 
@@ -4098,10 +4098,10 @@ msgstr ""
 
 #: lib/MIME/Viewer/itip.php:599 lib/MIME/Viewer/itip.php:601
 #: lib/MIME/Viewer/itip.php:775 lib/MIME/Viewer/itip.php:777
-msgid "Start"
+msgid "Start:"
 msgstr ""
 
-#: compose.php:1056 templates/stationery/stationery.html:8
+#: compose.php:1057 templates/stationery/stationery.html:8
 #: templates/stationery/stationery.html:12
 msgid "Stationery"
 msgstr ""
@@ -4158,8 +4158,8 @@ msgstr ""
 msgid "Subject:"
 msgstr ""
 
-#: templates/smime/passphrase.html:23 templates/search/search.html:25
-#: templates/search/search.html:182 templates/saveimage/saveimage.html:19
+#: templates/search/search.html:25 templates/search/search.html:182
+#: templates/saveimage/saveimage.html:19 templates/smime/passphrase.html:23
 #: templates/pgp/passphrase.html:21
 msgid "Submit"
 msgstr ""
@@ -4172,7 +4172,7 @@ msgstr ""
 msgid "Subscript"
 msgstr ""
 
-#: lib/MIME/Viewer/pgp.php:451 lib/MIME/Viewer/pkcs7.php:445
+#: lib/MIME/Viewer/pkcs7.php:448 lib/MIME/Viewer/pgp.php:456
 #: lib/MIME/Viewer/status.php:86
 msgid "Success"
 msgstr ""
@@ -4214,7 +4214,7 @@ msgstr ""
 msgid "Task Lists"
 msgstr ""
 
-#: config/hooks.php.dist:473
+#: config/hooks.php.dist:514
 msgid "Tasks"
 msgstr ""
 
@@ -4259,7 +4259,7 @@ msgstr ""
 msgid "The From: column of the message should be linked:"
 msgstr ""
 
-#: lib/IMAP/Client.php:432
+#: lib/IMAP/Client.php:434
 msgid ""
 "The IMAP server does not appear to support the authentication method "
 "selected. Please contact your system administrator."
@@ -4336,7 +4336,7 @@ msgstr ""
 msgid "The event was updated in your calendar."
 msgstr ""
 
-#: lib/Compose.php:2047
+#: lib/Compose.php:2051
 #, php-format
 msgid "The file %s could not be attached."
 msgstr ""
@@ -4346,7 +4346,7 @@ msgstr ""
 msgid "The folder \"%s\" already exists"
 msgstr ""
 
-#: folders.php:248 lib/Folder.php:190
+#: folders.php:259 lib/Folder.php:190
 #, php-format
 msgid "The folder \"%s\" may not be deleted."
 msgstr ""
@@ -4426,19 +4426,19 @@ msgstr ""
 msgid "The message being composed has been closed. Exiting."
 msgstr ""
 
-#: lib/MIME/Viewer/pgp.php:376
+#: lib/MIME/Viewer/pgp.php:381
 msgid ""
 "The message below does not appear to be a valid PGP encrypted message. "
 "Error: "
 msgstr ""
 
-#: lib/MIME/Viewer/pgp.php:252 lib/MIME/Viewer/pgp.php:411
+#: lib/MIME/Viewer/pgp.php:252 lib/MIME/Viewer/pgp.php:416
 msgid ""
 "The message below does not appear to be in the correct PGP format (according "
 "to RFC 2015)."
 msgstr ""
 
-#: lib/MIME/Viewer/pgp.php:371
+#: lib/MIME/Viewer/pgp.php:376
 msgid "The message below has been compressed with PGP."
 msgstr ""
 
@@ -4462,39 +4462,39 @@ msgstr ""
 msgid "The message below has been digitally signed with PGP."
 msgstr ""
 
-#: lib/MIME/Viewer/pgp.php:313
+#: lib/MIME/Viewer/pgp.php:318
 msgid ""
 "The message below has been encrypted with PGP, however, PGP support is "
 "disabled so the message cannot be decrypted."
 msgstr ""
 
-#: lib/MIME/Viewer/pgp.php:355
+#: lib/MIME/Viewer/pgp.php:360
 msgid ""
 "The message below has been encrypted with PGP, however, no personal private "
 "key exists so the message cannot be decrypted."
 msgstr ""
 
-#: lib/MIME/Viewer/pgp.php:371
+#: lib/MIME/Viewer/pgp.php:376
 msgid "The message below has been encrypted with PGP."
 msgstr ""
 
-#: lib/MIME/Viewer/pgp.php:365
+#: lib/MIME/Viewer/pgp.php:370
 msgid ""
 "The message below has been encrypted with PGP. You must enter the passphrase "
 "for your PGP private key before it can be decrypted."
 msgstr ""
 
-#: lib/MIME/Viewer/pgp.php:348
+#: lib/MIME/Viewer/pgp.php:353
 msgid ""
 "The message below has been encrypted with PGP. You must enter the passphrase "
 "that was used to encrypt this message."
 msgstr ""
 
-#: lib/MIME/Viewer/pgp.php:455
+#: lib/MIME/Viewer/pgp.php:460
 msgid "The message below has been verified."
 msgstr ""
 
-#: lib/Crypt/PGP.php:380
+#: lib/Crypt/PGP.php:382
 msgid "The message below has not been digitally signed or encrypted with PGP."
 msgstr ""
 
@@ -4522,7 +4522,7 @@ msgstr ""
 msgid "The message has been reported as spam."
 msgstr ""
 
-#: lib/MIME/Viewer/pkcs7.php:450
+#: lib/MIME/Viewer/pkcs7.php:453
 #, php-format
 msgid "The message has been verified. Sender: %s."
 msgstr ""
@@ -4629,7 +4629,7 @@ msgstr ""
 msgid "There are no messages in this mailbox."
 msgstr ""
 
-#: thread.php:104
+#: thread.php:108
 msgid "There is no text that can be displayed inline."
 msgstr ""
 
@@ -4651,7 +4651,7 @@ msgstr ""
 msgid "There was an error deleting the event:"
 msgstr ""
 
-#: lib/MIME/Viewer/enriched.php:36 lib/MIME/Viewer/plain.php:50
+#: lib/MIME/Viewer/plain.php:50 lib/MIME/Viewer/enriched.php:36
 msgid "There was an error displaying this message part"
 msgstr ""
 
@@ -4721,13 +4721,13 @@ msgstr ""
 msgid "This message contains a Macintosh file."
 msgstr ""
 
-#: lib/MIME/Viewer/pkcs7.php:476
+#: lib/MIME/Viewer/pkcs7.php:479
 msgid ""
 "This message contains an attachment that has been digitally signed via S/"
 "MIME."
 msgstr ""
 
-#: lib/MIME/Viewer/pkcs7.php:480
+#: lib/MIME/Viewer/pkcs7.php:483
 msgid "This message contains an attachment that has been encrypted via S/MIME."
 msgstr ""
 
@@ -4745,7 +4745,7 @@ msgstr ""
 msgid "This message has been digitally signed via S/MIME."
 msgstr ""
 
-#: lib/MIME/Viewer/pkcs7.php:170 lib/MIME/Viewer/pkcs7.php:294
+#: lib/MIME/Viewer/pkcs7.php:170 lib/MIME/Viewer/pkcs7.php:297
 msgid "This message has been encrypted via S/MIME."
 msgstr ""
 
@@ -4776,7 +4776,7 @@ msgstr ""
 msgid "Thread Display:"
 msgstr ""
 
-#: thread.php:177 config/prefs.php.dist:1206
+#: thread.php:181 config/prefs.php.dist:1206
 msgid "Thread View"
 msgstr ""
 
@@ -4788,9 +4788,9 @@ msgstr ""
 msgid "Thumbnail of attached image"
 msgstr ""
 
-#: compose.php:831 mailbox.php:587 lib/Search.php:716 lib/UI/Mailbox.php:90
-#: lib/UI/Message.php:26 templates/login/recompose.html:14
-#: templates/contacts/contacts.html:40
+#: compose.php:832 mailbox.php:587 lib/Search.php:716 lib/UI/Mailbox.php:90
+#: lib/UI/Message.php:26 templates/contacts/contacts.html:40
+#: templates/login/recompose.html:14
 msgid "To"
 msgstr ""
 
@@ -4838,7 +4838,7 @@ msgid ""
 "higher."
 msgstr ""
 
-#: thread.php:117 templates/thread/thread.html:31
+#: thread.php:121 templates/thread/thread.html:31
 msgid "To:"
 msgstr ""
 
@@ -4866,7 +4866,7 @@ msgstr ""
 msgid "Trash"
 msgstr ""
 
-#: lib/IMAP/Tree.php:1985
+#: lib/IMAP/Tree.php:1986
 msgid "Trash folder"
 msgstr ""
 
@@ -4882,9 +4882,9 @@ msgstr ""
 msgid "Unable to connect to SQL server."
 msgstr ""
 
-#: lib/Quota/command.php:91 lib/Quota/hook.php:42 lib/Quota/imap.php:43
-#: lib/Quota/logfile.php:85 lib/Quota/maildir.php:111 lib/Quota/mdaemon.php:45
-#: lib/Quota/mercury32.php:68
+#: lib/Quota/mercury32.php:68 lib/Quota/command.php:91
+#: lib/Quota/logfile.php:85 lib/Quota/hook.php:42 lib/Quota/maildir.php:111
+#: lib/Quota/imap.php:42 lib/Quota/mdaemon.php:45
 msgid "Unable to retrieve quota"
 msgstr ""
 
@@ -4897,7 +4897,7 @@ msgstr ""
 msgid "Unanswered messages"
 msgstr ""
 
-#: mailbox.php:514 message.php:552
+#: message.php:552 mailbox.php:514
 msgid "Undelete"
 msgstr ""
 
@@ -4909,7 +4909,7 @@ msgstr ""
 msgid "Underline"
 msgstr ""
 
-#: lib/UI/Mailbox.php:67 lib/UI/Mailbox.php:86 lib/MIME/Headers.php:254
+#: lib/MIME/Headers.php:254 lib/UI/Mailbox.php:67 lib/UI/Mailbox.php:86
 msgid "Undisclosed Recipients"
 msgstr ""
 
@@ -4917,11 +4917,11 @@ msgstr ""
 msgid "Undoes your last action"
 msgstr ""
 
-#: lib/IMAP/Client.php:462
+#: lib/IMAP/Client.php:464
 msgid "Unexpected response from server to AUTHENTICATE command."
 msgstr ""
 
-#: lib/IMAP/Client.php:428
+#: lib/IMAP/Client.php:430
 msgid "Unexpected response from server to Digest-MD5 response."
 msgstr ""
 
@@ -4959,7 +4959,7 @@ msgstr ""
 msgid "Unknown Task"
 msgstr ""
 
-#: pgp.php:447 smime.php:346
+#: smime.php:346 pgp.php:447
 msgid "Unload Passphrase"
 msgstr ""
 
@@ -4967,7 +4967,7 @@ msgstr ""
 msgid "Unnamed"
 msgstr ""
 
-#: mailbox.php:757 message.php:474 templates/message/navbar_navigate.html:9
+#: message.php:474 mailbox.php:757 templates/message/navbar_navigate.html:9
 #: templates/mailbox/navbar.html:15 templates/mailbox/navbar.html:31
 msgid "Unseen"
 msgstr ""
@@ -5041,12 +5041,12 @@ msgstr ""
 msgid "View"
 msgstr ""
 
-#: lib/MIME/Viewer/tnef.php:109 lib/MIME/Viewer/zip.php:99
+#: lib/MIME/Viewer/zip.php:99 lib/MIME/Viewer/tnef.php:109
 #, php-format
 msgid "View %s"
 msgstr ""
 
-#: pgp.php:417 smime.php:318
+#: smime.php:318 pgp.php:417
 #, php-format
 msgid "View %s Public Key"
 msgstr ""
@@ -5060,11 +5060,11 @@ msgstr ""
 msgid "View Messages"
 msgstr ""
 
-#: pgp.php:448 smime.php:347
+#: smime.php:347 pgp.php:448
 msgid "View Personal Private Key"
 msgstr ""
 
-#: pgp.php:442 smime.php:343
+#: smime.php:343 pgp.php:442
 msgid "View Personal Public Key"
 msgstr ""
 
@@ -5072,7 +5072,7 @@ msgstr ""
 msgid "View Thread"
 msgstr ""
 
-#: lib/MIME/Viewer/pkcs7.php:484
+#: lib/MIME/Viewer/pkcs7.php:487
 msgid "View attachment in a separate window"
 msgstr ""
 
@@ -5084,7 +5084,7 @@ msgstr ""
 msgid "View event"
 msgstr ""
 
-#: folders.php:436 mailbox.php:695
+#: folders.php:447 mailbox.php:695
 #, php-format
 msgid "View messages in %s"
 msgstr ""
@@ -5118,7 +5118,7 @@ msgstr ""
 msgid "Virtual INBOX"
 msgstr ""
 
-#: lib/IMAP/Tree.php:2025
+#: lib/IMAP/Tree.php:2026
 msgid "Virtual INBOX Folder"
 msgstr ""
 
@@ -5126,7 +5126,7 @@ msgstr ""
 msgid "Virtual Trash"
 msgstr ""
 
-#: lib/IMAP/Tree.php:2021
+#: lib/IMAP/Tree.php:2022
 msgid "Virtual Trash Folder"
 msgstr ""
 
@@ -5134,7 +5134,7 @@ msgstr ""
 msgid "Virtual folder label:"
 msgstr ""
 
-#: lib/MIME/Viewer/pkcs7.php:439 lib/Crypt/PGP.php:380
+#: lib/Crypt/PGP.php:382 lib/MIME/Viewer/pkcs7.php:442
 msgid "Warning"
 msgstr ""
 
@@ -5192,7 +5192,7 @@ msgstr ""
 msgid "Where should the cursor be located in the compose text area by default?"
 msgstr ""
 
-#: mailbox.php:530 message.php:584
+#: message.php:584 mailbox.php:530
 msgid "Whitelist"
 msgstr ""
 
@@ -5317,18 +5317,18 @@ msgstr ""
 msgid "You must enter at least one recipient."
 msgstr ""
 
-#: lib/MIME/Viewer/pgp.php:365
+#: lib/MIME/Viewer/pgp.php:370
 msgid ""
 "You must enter the passphrase for your PGP private key to view this message."
 msgstr ""
 
-#: lib/MIME/Viewer/pkcs7.php:313
+#: lib/MIME/Viewer/pkcs7.php:316
 msgid ""
 "You must enter the passphrase for your S/MIME private key to view this "
 "message"
 msgstr ""
 
-#: lib/MIME/Viewer/pgp.php:348
+#: lib/MIME/Viewer/pgp.php:353
 msgid "You must enter the passphrase that was used to encrypt this message."
 msgstr ""
 
@@ -5476,8 +5476,8 @@ msgstr ""
 msgid "[Hide Addresses]"
 msgstr ""
 
-#: mailbox.php:719 message.php:285 rss.php:75 lib/Compose.php:1891
-#: lib/Compose.php:2369
+#: message.php:285 rss.php:75 mailbox.php:719 lib/Compose.php:1895
+#: lib/Compose.php:2373
 msgid "[No Subject]"
 msgstr ""
 
@@ -5494,7 +5494,7 @@ msgstr ""
 msgid "[Show Addresses - %d recipients]"
 msgstr ""
 
-#: lib/Compose.php:3015
+#: lib/Compose.php:3019
 msgid "[Truncated Text]"
 msgstr ""
 
@@ -5502,19 +5502,19 @@ msgstr ""
 msgid "[View the raw key]"
 msgstr ""
 
-#: compose.php:966
+#: compose.php:967
 msgid "_Bcc"
 msgstr ""
 
-#: mailbox.php:526 message.php:580
+#: message.php:580 mailbox.php:526
 msgid "_Blacklist"
 msgstr ""
 
-#: compose.php:963
+#: compose.php:964
 msgid "_Cc"
 msgstr ""
 
-#: mailbox.php:508 mailbox.php:510 message.php:554
+#: message.php:554 mailbox.php:508 mailbox.php:510
 msgid "_Delete"
 msgstr ""
 
@@ -5522,7 +5522,7 @@ msgstr ""
 msgid "_Folders"
 msgstr ""
 
-#: compose.php:943
+#: compose.php:944
 msgid "_Identity"
 msgstr ""
 
@@ -5546,7 +5546,7 @@ msgstr ""
 msgid "_Print"
 msgstr ""
 
-#: compose.php:1035
+#: compose.php:1036
 msgid "_Priority"
 msgstr ""
 
@@ -5563,7 +5563,7 @@ msgstr ""
 msgid "_Search"
 msgstr ""
 
-#: compose.php:928
+#: compose.php:929
 msgid "_Send Message"
 msgstr ""
 
@@ -5571,7 +5571,7 @@ msgstr ""
 msgid "_Thread"
 msgstr ""
 
-#: compose.php:959 compose.php:961
+#: compose.php:960 compose.php:962
 msgid "_To"
 msgstr ""
 
@@ -5583,7 +5583,7 @@ msgstr ""
 msgid "_View Thread"
 msgstr ""
 
-#: mailbox.php:530 message.php:584
+#: message.php:584 mailbox.php:530
 msgid "_Whitelist"
 msgstr ""
 
@@ -5595,7 +5595,7 @@ msgstr ""
 msgid "and"
 msgstr ""
 
-#: lib/Compose.php:2002
+#: lib/Compose.php:2006
 msgid "attachment"
 msgstr ""
 
@@ -5659,7 +5659,7 @@ msgstr ""
 msgid "into folder"
 msgstr ""
 
-#: pgp.php:84 smime.php:39
+#: smime.php:39 pgp.php:84
 msgid "key"
 msgstr ""
 
diff --git a/po/it_IT.po b/po/it_IT.po
index 70b25fb..85efb4f 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -136,7 +136,7 @@ msgstr "%s ha annullato %s."
 #: lib/MIME/Viewer/itip.php:268
 #, php-format
 msgid "%s has declined."
-msgstr "%s ha rifuitato."
+msgstr "%s ha rifiutato."
 
 #: lib/MIME/Viewer/itip.php:511
 #, php-format
@@ -151,7 +151,7 @@ msgstr "%s ha risposto al invito a %s."
 #: lib/MIME/Viewer/itip.php:502
 #, php-format
 msgid "%s has sent you free/busy information."
-msgstr "%s ti ha mandato informazioni libero/occupato."
+msgstr "%s ti ha mandato le informazioni libero/occupato."
 
 #: lib/MIME/Viewer/itip.php:274
 #, php-format
@@ -161,7 +161,7 @@ msgstr "%s tentativi accettati."
 #: lib/MIME/Viewer/itip.php:507
 #, php-format
 msgid "%s requests your free/busy information."
-msgstr "%s richiede informazionsi sul tuo libero/occupato."
+msgstr "%s richiede le tue informazioni libero/occupato."
 
 #: lib/MIME/Viewer/itip.php:625
 #, php-format
@@ -283,6 +283,10 @@ msgstr "Sopra il testo del messaggio."
 msgid "Accept and add to my calendar"
 msgstr "Accetta e Aggiungi al mio calendario"
 
+#: lib/MIME/Viewer/itip.php:662
+msgid "Accept and update in my calendar"
+msgstr "Accetta e aggiorna il mio calendario"
+
 #: lib/MIME/Viewer/itip.php:631
 msgid "Accept request"
 msgstr "Accetta Richieste"
@@ -346,7 +350,7 @@ msgstr "Ulteriori informazioni possono essere visualizzate %s"
 
 #: lib/MIME/Viewer/notification.php:60
 msgid "Additional information details"
-msgstr "Ulteriori Informazioni Personale"
+msgstr "Ulteriori Informazioni Personali"
 
 #: lib/MIME/Viewer/status.php:92
 msgid "Additional message details"
@@ -480,12 +484,12 @@ msgstr ""
 #, php-format
 msgid "An image named %s is attached to this message. A thumbnail is below."
 msgstr ""
-"Un immagine nominata %s è allegata a questo messaggio. Una miniatura è "
+"Un'immagine nominata %s è allegata a questo messaggio. Una miniatura è "
 "disponibile sotto."
 
 #: lib/Message.php:444
 msgid "An unknown error occured while creating the new note."
-msgstr "Si è verificato un errore sconosciuto acreando una nuova nota."
+msgstr "Si è verificato un errore sconosciuto creando una nuova nota."
 
 #: lib/Message.php:443
 msgid "An unknown error occured while creating the new task."
@@ -604,6 +608,10 @@ msgstr "File Allegati"
 msgid "Attach a copy of your PGP public key to your message?"
 msgstr "Includi copia della tua chiave pubblica PGP al messaggio?"
 
+#: compose.php:1160
+msgid "Attach your contact information to the message?"
+msgstr "Aggiungi le tue informazioni personali al messaggio?"
+
 #: lib/MIME/Viewer/tnef.php:110
 msgid "Attached File:"
 msgstr "File Allegato:"
@@ -613,7 +621,7 @@ msgstr "File Allegato:"
 msgid ""
 "Attached file \"%s\" exceeds the attachment size limits. File NOT attached."
 msgstr ""
-"La dimandione del file allegato \"%s\" è superiore a quella consentita. File "
+"La dimensione del file allegato \"%s\" è superiore a quella consentita. File "
 "non allegato."
 
 #: lib/MIME/Viewer/itip.php:387
@@ -722,7 +730,7 @@ msgstr "Prima della firma"
 
 #: lib/MIME/Viewer/status.php:160
 msgid "Below is the raw text of the status information message."
-msgstr "Qui sotto è il testo completo dello messaggio informativo."
+msgstr "Qui sotto c'è il testo completo dello messaggio informativo."
 
 #: config/prefs.php.dist:930
 msgid "Below the message text"
@@ -819,7 +827,7 @@ msgid ""
 "folder will be used."
 msgstr ""
 "Non posso attivare sia la cartella cestino che il cestino virtuale. Verrà "
-"usato l cestino virtuale."
+"usato il cestino virtuale."
 
 #: lib/Fetchmail/imap.php:151
 msgid "Cannot connect to the remote mail server."
@@ -831,7 +839,7 @@ msgstr "Impossibile connettersi al server di posta remoto: "
 
 #: lib/prefs.php:164
 msgid "Cannot delete to trash unless a Trash folder is defined."
-msgstr "Non posso eliminare finchè non viene definita una cartella cestino"
+msgstr "Non posso eliminare finchè non viene definita una cartella Cestino"
 
 #: lib/MIME/Viewer/partial.php:47
 #, php-format
@@ -980,18 +988,24 @@ msgstr "Clicca %s per vedere la parte multipart/related in una nuova finestra."
 msgid "Click HERE to verify the message."
 msgstr "Clicca QUI per verificare il messaggio."
 
+#: config/prefs.php.dist:531
+#, php-format
+msgid "Click here to open all mailto: links in %s."
+msgstr ""
+"Clicca qui per impostare l'apertura dei link \"mailto\" tramite questa %s."
+
 #: templates/prefs/sourceselect.inc:319
 msgid ""
 "Click on one of your selected address books and then select all fields to "
 "search."
 msgstr ""
-"Clicca si una delle rubriche selezionate e selezionare tutti i campi su cui "
+"Clicca su una delle rubriche selezionate e seleziona tutti i campi su cui "
 "cercare."
 
 #: config/prefs.php.dist:1198
 msgid "Clicking on the address will compose a new message to the sender"
 msgstr ""
-"Cliccando sull'indirizzo si comporra un nuovo messaggio per il mittente"
+"Cliccando sull'indirizzo si comporrà un nuovo messaggio per il mittente"
 
 #: config/prefs.php.dist:1199
 msgid "Clicking on the address will open the message to be read"
@@ -1140,7 +1154,7 @@ msgid ""
 "preferences."
 msgstr ""
 "Non posso spostare il messaggio nella cartella spam - nessuna cartella spam "
-"definita nelle opzioni"
+"definita nelle opzioni."
 
 #: lib/IMAP/Client.php:318
 msgid "Could not open secure connection to the IMAP server."
@@ -1162,7 +1176,7 @@ msgstr "Non posso salvare destinatari: %s"
 #: lib/Template.php:230
 #, php-format
 msgid "Could not save the compiled template file '%s'."
-msgstr "Impossibile salvare teplate file '%s'."
+msgstr "Impossibile salvare il template compilato '%s'."
 
 #: templates/folders/actions.html:16
 #: templates/fetchmail/fetchmailprefs.html:121
@@ -1242,6 +1256,14 @@ msgstr "Stile corrente"
 msgid "Customize accounts for fetching mail from other accounts."
 msgstr "Personalizza account per scaricare posta da altri account."
 
+#: config/prefs.php.dist:88
+msgid "Customize how to deal with message drafts."
+msgstr "Personalizza come gestisci i messaggi in stato di bozza."
+
+#: config/prefs.php.dist:80
+msgid "Customize how you reply to or forward mail."
+msgstr "Personalizza come rispondi o inoltri la posta."
+
 #: config/prefs.php.dist:64
 msgid "Customize how you send mail."
 msgstr "Personalizza come invii la posta."
@@ -1436,7 +1458,7 @@ msgstr "Dettagli"
 #: lib/Compose.php:2877
 #, php-format
 msgid "Did not attach \"%s\" as it was only partially uploaded."
-msgstr "%s non è stato allegato in quanto è stato caricato parzialmente."
+msgstr "%s non è stato allegato in quanto è stato caricato solo parzialmente."
 
 #: lib/Compose.php:2886
 #, php-format
@@ -1718,7 +1740,7 @@ msgstr "Errori durante la connessione al server IMAP: [%s] %s."
 
 #: lib/MIME/Contents.php:150
 msgid "Error displaying message."
-msgstr "Si è verificato un errore visualizzando questa parte del messaggio"
+msgstr "Si è verificato un errore visualizzando questa parte del messaggio."
 
 #: lib/MIME/Viewer/itip.php:316 lib/MIME/Viewer/itip.php:419
 #, php-format
@@ -1842,7 +1864,7 @@ msgstr "Controlla se nei messaggi ci sono parole offensive."
 
 #: templates/filters/prefs.html:7
 msgid "Filter support is disabled on this system."
-msgstr "Supporto filtri è disabilitato su questo sistema."
+msgstr "Il Supporto filtri è disabilitato su questo sistema."
 
 #: config/prefs.php.dist:149
 msgid "Filters"
@@ -2388,7 +2410,7 @@ msgid ""
 "List all contacts when loading the contacts screen? (if disabled, you will "
 "only see contacts that you search for explicitly)"
 msgstr ""
-"Carica tutti i contatti quando mostri schermo conatti? (se disabilitato "
+"Carica tutti i contatti quando mostri schermo contatti? (se disabilitato "
 "vedrai solo i contatti che ricerchi esplicitamente)"
 
 #: config/prefs.php.dist:893
@@ -2542,12 +2564,20 @@ msgstr "Composizione Messaggio"
 msgid "Message Date"
 msgstr "Data Messaggio"
 
+#: config/prefs.php.dist:87
+msgid "Message Drafts"
+msgstr "Bozze"
+
 #: config/prefs.php.dist:62 config/prefs.php.dist:81 config/prefs.php.dist:96
 #: config/prefs.php.dist:109 config/prefs.php.dist:117
 #: config/prefs.php.dist:126
 msgid "Message Options"
 msgstr "Opzioni Messaggi"
 
+#: config/prefs.php.dist:79
+msgid "Message Replies/Forwards"
+msgstr "Risposte/Inoltri"
+
 #: search.php:318
 msgid "Message Search"
 msgstr "Ricerca Messaggio"
@@ -2682,7 +2712,7 @@ msgstr "Nuova Posta"
 
 #: compose.php:33 compose.php:229 lib/Block/tree_folders.php:35
 msgid "New Message"
-msgstr "Nuovo Messaggio"
+msgstr "Componi"
 
 #: mailbox.php:857 lib/MIME/Headers.php:214 lib/MIME/Headers.php:239
 #, php-format
@@ -2742,7 +2772,7 @@ msgstr "Nessun Allegato Trovato"
 
 #: lib/Crypt/SMIME.php:131
 msgid "No email information located in the public key."
-msgstr "Nessuna informazioni sulla email trovata nella Chiave Pubblica."
+msgstr "Nessuna informazione sulla email trovata nella Chiave Pubblica."
 
 #: acl.php:76
 msgid "No folder selected."
@@ -2770,7 +2800,7 @@ msgstr "Nessun Limite"
 
 #: lib/Compose.php:1701
 msgid "No message body text"
-msgstr "Nessun testo del corpo messaggio."
+msgstr "Nessun testo nel corpo messaggio."
 
 #: lib/IMAP/Client.php:474
 msgid "No message returned."
@@ -2853,7 +2883,7 @@ msgstr "Mai"
 
 #: lib/Maintenance/Task/fetchmail_login.php:70
 msgid "Note that this can take some time"
-msgstr "Nota che questo può richedere un po' di tempo"
+msgstr "Nota che questo può richiedere un po' di tempo"
 
 #: lib/IMP.php:542
 msgid "Notepads"
@@ -2874,7 +2904,7 @@ msgstr "Notifica: l'allegato collegato 
 #: config/prefs.php.dist:419
 msgid "Number of months to keep old linked attachments if deleting monthly."
 msgstr ""
-"Quanti mesi conservare vecchi allegati se impostata eliminazione mensile"
+"Quanti mesi conservare vecchi allegati se impostata eliminazione mensile."
 
 #: config/prefs.php.dist:373
 msgid "Number of old sent-mail folders to keep if deleting monthly."
@@ -2901,7 +2931,7 @@ msgstr "Mostra solo cartelle con messeggi non letti?"
 
 #: templates/javascript_defs.php:58
 msgid "Only one folder should be selected for this action."
-msgstr "Solo una cartella può essere selezionato per questa azione"
+msgstr "Solo una cartella può essere selezionata per questa azione"
 
 #: lib/IMP.php:922 lib/IMP.php:927
 msgid "Open Fo_lder"
@@ -3024,7 +3054,7 @@ msgid ""
 msgstr ""
 "Il supporto PGP necessita di utlizzare finestre popup. Se il tuo browser è "
 "settato per non utilizzare finestre popup, devi modificare le impostazioni "
-"del browser o le funzioni PGP non funzioneranno correttamente"
+"del browser o le funzioni PGP non funzioneranno correttamente."
 
 #: lib/Compose.php:1335
 msgid "PGP: Need passphrase for personal private key."
@@ -3177,7 +3207,7 @@ msgid ""
 "enter this passphrase once per session."
 msgstr ""
 "Prego inserire la parola chiave della chiave privata PGP. Occorre inserirla "
-"inserirla solo una volta per sessione."
+"solo una volta per sessione."
 
 #: templates/smime/passphrase.html:15
 msgid ""
@@ -3198,8 +3228,8 @@ msgstr ""
 "del messaggio. Se non state utilizzando cookies e state scrivendo il "
 "messaggio in una finestra di popup, sarà necessario accedere di nuovo anche "
 "dalla finestra principale. Questo comportamento è dovuto al sistema di "
-"protezione che evita che gli attacker utilizzino il vostro ID di sessione.Ci "
-"scusiamo per ogni inconveniente."
+"protezione che evita che gli attacker utilizzino il vostro ID di sessione. "
+"Ci scusiamo per ogni inconveniente."
 
 #: templates/javascript_defs.php:76
 msgid "Please provide your password."
@@ -3332,7 +3362,8 @@ msgstr "Ogni quanto svuotare il Cestino:"
 
 #: config/prefs.php.dist:447
 msgid "Purge messages in Spam folder older than this amount of days."
-msgstr "Elimina i messaggi dalla cartella Spam più vecchi di giorni."
+msgstr ""
+"Elimina i messaggi dalla cartella Spam più vecchi di questo numero di giorni."
 
 #: config/prefs.php.dist:475
 msgid "Purge messages in Trash folder older than this amount of days."
@@ -3340,7 +3371,9 @@ msgstr "Elimina i messaggi dalla cartella Cestino pi
 
 #: config/prefs.php.dist:401
 msgid "Purge messages in sent-mail folder(s) older than this amount of days."
-msgstr "Elimina i messaggi dalle cartelle posta Inviata più vecchi di giorni."
+msgstr ""
+"Elimina i messaggi dalle cartelle posta Inviata più vecchi di questo numero "
+"di giorni."
 
 #: config/prefs.php.dist:428
 msgid "Purge old messages in the Spam folder?"
@@ -3404,7 +3437,7 @@ msgstr "Status Quota: Ness Limite"
 #: config/prefs.php.dist:698
 #, php-format
 msgid "Quoting %f:"
-msgstr "Def. Quota %f:"
+msgstr "%f ha scritto:"
 
 #: lib/IMAP/ACL/rfc2086.php:50 lib/IMAP/ACL/rfc4314.php:50
 msgid "Read"
@@ -3800,7 +3833,7 @@ msgstr "Salva posta inviata?"
 
 #: lib/Compose.php:240
 msgid "Saving the draft failed. Could not create a drafts folder."
-msgstr "Salvataggio della Bozza fallito. Impossibile creare la cartella Bozze"
+msgstr "Salvataggio della Bozza fallito. Impossibile creare la cartella Bozze."
 
 #: lib/Compose.php:179
 msgid "Saving the draft failed. No draft folder specified."
@@ -3937,7 +3970,7 @@ msgstr "Inviare il Messaggio senza Oggetto?"
 
 #: config/prefs.php.dist:247
 msgid "Sent"
-msgstr "Inviato"
+msgstr "Posta inviata"
 
 #: lib/IMAP/Tree.php:2349
 msgid "Sent mail folder"
@@ -4002,7 +4035,7 @@ msgid ""
 "Should large blocks of quoted text be shown or hidden by default? It can be "
 "toggled easily whichever you choose."
 msgstr ""
-"Larghi blocchi di testo quotato devono essere nascosto o visualizzati di "
+"Larghi blocchi di testo quotato devono essere nascosti o visualizzati di "
 "default? Può essere modificato facilmente quando si desidera."
 
 #: templates/pgp/pgp.html:11
@@ -4168,7 +4201,7 @@ msgstr "Caratteri Speciali"
 
 #: search.php:39
 msgid "Special Virtual Folders cannot be edited."
-msgstr "Le cartelle Virtuali Speciali non possono essere modificate"
+msgstr "Le cartelle Virtuali Speciali non possono essere modificate."
 
 #: lib/UI/Compose.php:141
 msgid "Spell Check Failed"
@@ -4387,7 +4420,7 @@ msgstr "Pulsanti da visualizzare usando FCKeditor."
 
 #: lib/MIME/Viewer/itip.php:70
 msgid "The calendar data is invalid"
-msgstr "I dati di calnedario non sono validi"
+msgstr "I dati di calendario non sono validi"
 
 #: lib/MIME/Viewer/appledouble.php:41
 msgid "The contents of the Macintosh file are below."
@@ -4417,6 +4450,10 @@ msgstr "La bozza 
 msgid "The event was added to your calendar."
 msgstr "L'evento è stato aggiunto al tuo calendario."
 
+#: lib/MIME/Viewer/itip.php:147
+msgid "The event was updated in your calendar."
+msgstr "L'evento è stato aggiornato nel tuo calendario."
+
 #: lib/Compose.php:2015
 #, php-format
 msgid "The file %s could not be attached."
@@ -4478,7 +4515,7 @@ msgid ""
 "The image save window can not be opened. Perhaps you have set your browser "
 "to block popup windows?"
 msgstr ""
-"Impossibile aprire la finestra di salvataggio immagine. probabilmente il "
+"Impossibile aprire la finestra di salvataggio immagine. Probabilmente il "
 "browser blocca i popup"
 
 #: config/prefs.php.dist:526
@@ -4880,10 +4917,10 @@ msgstr "Questo messaggio a"
 #, php-format
 msgid ""
 "This request cannot be completed because the link you followed or the form "
-"you submitted was only valid for %s seconds"
+"you submitted was only valid for %d minutes. Please try again now."
 msgstr ""
 "La richiesta non può essere completata in quanto il link usato o il form "
-"inviato era valido solo per %s secondi"
+"inviato erano validi solo per %d minuti. Si prega di riprovare ora."
 
 #: acl.php:47
 msgid "This server does not support sharing folders."
@@ -4950,6 +4987,10 @@ msgid ""
 msgstr ""
 "Per selezioni multiple, cliccare tenendo premuto CTRL (PC) o Command (Mac)."
 
+#: config/prefs.php.dist:514
+msgid "To the stationery and form responses."
+msgstr "Vai ai modelli e moduli di risposta."
+
 #: lib/IMAP/Client.php:131
 msgid ""
 "To use a TLS connection, you must be running a version of PHP 5.1.0 or "
@@ -5099,6 +5140,10 @@ msgstr "Elimina sottoscrizione"
 msgid "Update"
 msgstr "Aggiorna"
 
+#: lib/MIME/Viewer/itip.php:663 lib/MIME/Viewer/itip.php:703
+msgid "Update in my calendar"
+msgstr "Aggiorna il mio calendario"
+
 #: lib/MIME/Viewer/itip.php:661
 msgid "Update respondent status"
 msgstr "Status del rispondente aggiornato"
@@ -5254,10 +5299,11 @@ msgstr "Attenzione"
 #: lib/IMP.php:334
 msgid ""
 "We cannot verify that this request was really sent by you. It could be a "
-"malicious request."
+"malicious request. If you intended to perform this action, you can retry it "
+"now."
 msgstr ""
 "Impossibile verificare che questa richiesta sia veramente la tua. Potrebbe "
-"essere una richiesta malevola."
+"essere una richiesta malevola. Se intendi procedere, puoi riprovare adesso."
 
 #: login.php:197 login.php:356 templates/login/mobile.inc:11
 #, php-format
@@ -5306,7 +5352,7 @@ msgid ""
 "unqualified addresses (email addresses without \"@\")?"
 msgstr ""
 "Inviando una email o espandendo gli indirizzi, che dominio aggiungere alle "
-"email non qualificati (quelli senza \"@\")?"
+"email non qualificate (quelle senza \"@\")?"
 
 #: config/prefs.php.dist:932
 msgid "Where do you want to display links to alternative formats of a message?"
@@ -5351,7 +5397,7 @@ msgstr "Stai cercando di cancellare le seguenti cartelle"
 
 #: templates/javascript_defs.php:81
 msgid "You are copying/moving to a new folder."
-msgstr "Stai compiando/spostando ad una nuova cartella."
+msgstr "Stai copiando/spostando ad una nuova cartella."
 
 #: templates/javascript_defs.php:59
 msgid "You are creating a sub-folder to"
@@ -5392,7 +5438,7 @@ msgid ""
 "You can use the following placeholders in the stationery text: %c for the "
 "current message content; %s for the signature."
 msgstr ""
-"Puoi usare i seguenti simbli nel testo del modello: %c per il contenuto del "
+"Puoi usare i seguenti simboli nel testo del modello: %c per il contenuto del "
 "messaggio corrente; %s per la firma."
 
 #: lib/Folder.php:488
@@ -5681,7 +5727,7 @@ msgstr "Intestazioni _Messaggio"
 
 #: lib/IMP.php:857
 msgid "_New Message"
-msgstr "_Nuovo Messaggio"
+msgstr "_Componi"
 
 #: message.php:602
 msgid "_Print"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index a14fae8..a6e1104 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: pt_BR\n"
 "Report-Msgid-Bugs-To: dev at lists.horde.org\n"
 "POT-Creation-Date: 2008-09-25 12:32+0200\n"
-"PO-Revision-Date: 2008-10-12 21:50-0200\n"
+"PO-Revision-Date: 2009-05-29 13:17+0200\n"
 "Last-Translator: Luis Felipe Marzagao <duli at fedoraproject.org>\n"
 "Language-Team: Português brasileiro <i18n at lists.horde.org>\n"
 "MIME-Version: 1.0\n"
@@ -3840,7 +3840,7 @@ msgstr "Gravar destinat
 
 #: templates/search/search.html:173
 msgid "Save search as a virtual folder?"
-msgstr "Garvar pesquisa como uma pasta virtual?"
+msgstr "Gravar pesquisa como uma pasta virtual?"
 
 #: config/prefs.php.dist:255
 msgid "Save sent mail?"
diff --git a/templates/common-header.inc b/templates/common-header.inc
index 283e59f..ea37277 100644
--- a/templates/common-header.inc
+++ b/templates/common-header.inc
@@ -16,6 +16,10 @@ if (!empty($title)) $page_title .= ' :: ' . $title;
 if (!empty($refresh_time) && !empty($refresh_url)) {
     echo "<meta http-equiv=\"refresh\" content=\"$refresh_time;url=$refresh_url\" />\n";
 }
+if ($GLOBALS['browser']->isBrowser('msie') &&
+    ($GLOBALS['browser']->getMajor() == 8)) {
+    echo '<meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7" />' . "\n";
+}
 echo Util::bufferOutput('require', IMP_TEMPLATES . '/javascript_defs.php');
 IMP::includeScriptFiles();
 IMP::includeStylesheetFiles(!empty($printer_friendly));
diff --git a/themes/screen.css b/themes/screen.css
index 3447991..dd5d563 100644
--- a/themes/screen.css
+++ b/themes/screen.css
@@ -1,5 +1,5 @@
 /**
- * $Horde: imp/themes/screen.css,v 1.2.2.35 2009/03/07 13:52:35 jan Exp $
+ * $Horde: imp/themes/screen.css,v 1.2.2.36 2009/05/27 15:47:08 jan Exp $
  */
 
 /* Align styles, added for BC. */
@@ -172,6 +172,12 @@ ul.msgactions, ul.msgactions ul {
     background: #fff;
     padding: 8px;
 }
+.signedvalid td {
+    background: #cfc;
+}
+.signedinvalid td {
+    background: #ffd0af;
+}
 
 /* Search page styling. */
 form#search div {
diff --git a/thread.php b/thread.php
index 3e88649..5cfcf73 100644
--- a/thread.php
+++ b/thread.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * $Horde: imp/thread.php,v 2.10.2.28 2009/01/06 15:24:02 jan Exp $
+ * $Horde: imp/thread.php,v 2.10.2.29 2009/07/23 11:33:34 jan Exp $
  *
  * Copyright 2004-2009 The Horde Project (http://www.horde.org/)
  *
@@ -96,6 +96,10 @@ foreach ($loop_array as $mbox => $idxlist) {
         /* Get the body of the message. */
         $curr_msg = $curr_tree = array();
         $contents = &IMP_Contents::singleton($idx . IMP_IDX_SEP . $mbox);
+        if (is_a($contents, 'PEAR_Error')) {
+            $notification->push($contents, 'horde.error');
+            continue;
+        }
         $mime_id = $contents->findBody();
         $mime_part = $contents->getDecodedMIMEPart($mime_id);
         if ($contents->canDisplayInline($mime_part)) {

-- 
Debian Horde Packages repository: imp4 package



More information about the pkg-horde-hackers mailing list