From ca1cf24076dc29cc76b5aba79f76b5ca81c48a8d Mon Sep 17 00:00:00 2001
From: Marc Blank <mblank@google.com>
Date: Fri, 17 Aug 2012 13:54:59 -0700
Subject: [PATCH] Handle non-ascii folder names properly

Bug: 6992874
Change-Id: I098af4a867256f30b3610e42cadc9651c490abd8
---
 imap2/src/com/android/imap2/Imap2SyncService.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/imap2/src/com/android/imap2/Imap2SyncService.java b/imap2/src/com/android/imap2/Imap2SyncService.java
index 8f069d9c2..82a5ffa95 100644
--- a/imap2/src/com/android/imap2/Imap2SyncService.java
+++ b/imap2/src/com/android/imap2/Imap2SyncService.java
@@ -1223,9 +1223,9 @@ public class Imap2SyncService extends AbstractSyncService {
 
                     }
                     Mailbox m = new Mailbox();
-                    m.mDisplayName = displayName;
+                    m.mDisplayName = decodeFolderName(displayName, null);
                     m.mAccountKey = mAccountId;
-                    m.mServerId = serverId;
+                    m.mServerId = decodeFolderName(serverId, null);
                     if (parentName != null && !parentList.contains(parentName)) {
                         parentList.add(parentName);
                     }