From e015436710ade7d095398f45ea2ea9ee9bcba684 Mon Sep 17 00:00:00 2001
From: Michael M Slusarz <slusarz@curecanti.org>
Date: Thu, 23 Sep 2010 13:11:11 -0600
Subject: [PATCH] Use Virtual Folder labeling instead of querytext in dimp

---
 imp/lib/Views/ListMessages.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/imp/lib/Views/ListMessages.php b/imp/lib/Views/ListMessages.php
index d12249c83..f6cbdbf4f 100644
--- a/imp/lib/Views/ListMessages.php
+++ b/imp/lib/Views/ListMessages.php
@@ -148,12 +148,14 @@ class IMP_Views_ListMessages
         /* The search query may have changed. */
         if ($is_search &&
             ($args['initial'] || strlen($args['qsearchmbox']))) {
-            $md->slabel = $imp_search[$mbox]->querytext;
             if ($imp_search->isVFolder($mbox)) {
+                $md->slabel = $imp_search[$mbox]->label;
                 $md->vfolder = 1;
                 if (!$imp_search->isVFolder($mbox, true)) {
                     $md->noedit = 1;
                 }
+            } else {
+                $md->slabel = $imp_search[$mbox]->querytext;
             }
         }
 
-- 
2.11.0