From a3b85d7b8560cdc1057fcaffa3acbd247b4b5b7a Mon Sep 17 00:00:00 2001
From: Thomas B. <thomas@roundcube.net>
Date: Mon, 07 Oct 2013 13:19:03 -0400
Subject: [PATCH] Merge pull request #133 from cwickert/release-0.9-canned-responses

---
 plugins/archive/archive.php |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/plugins/archive/archive.php b/plugins/archive/archive.php
index 33e0daa..0a298cb 100644
--- a/plugins/archive/archive.php
+++ b/plugins/archive/archive.php
@@ -67,9 +67,10 @@
   {
     $rcmail = rcmail::get_instance();
     $archive_folder = $rcmail->config->get('archive_mbox');
+    $localize_name = $rcmail->config->get('archive_localize_name', true);
 
     // set localized name for the configured archive folder
-    if ($archive_folder) {
+    if ($archive_folder && $localize_name) {
       if (isset($p['list'][$archive_folder]))
         $p['list'][$archive_folder]['name'] = $this->gettext('archivefolder');
       else // search in subfolders

--
Gitblit v1.9.1