diff --git a/EWSEditor/Forms/FolderTreeForm.cs b/EWSEditor/Forms/FolderTreeForm.cs
index 42f0ce1..c4b0ab0 100644
--- a/EWSEditor/Forms/FolderTreeForm.cs
+++ b/EWSEditor/Forms/FolderTreeForm.cs
@@ -1587,7 +1587,23 @@ private TreeNode AddServiceToTreeView(ExchangeService service, EWSEditor.Common.
 
                 if (res == DialogResult.Yes)
                 {
-                    FolderId oNewFodler = new FolderId(WellKnownFolderName.Root);
+                    FolderId oNewFodler = null;
+
+                    if (service.HttpHeaders.ContainsKey("X-AnchorMailbox"))
+                    {
+                        string addr = service.HttpHeaders["X-AnchorMailbox"];
+                        if (!string.IsNullOrEmpty(addr))
+                        {
+                            Mailbox mailbox = new Mailbox(addr);
+                            oNewFodler = new FolderId(WellKnownFolderName.Root, mailbox);
+                        }
+                    }
+                    
+                    if (oNewFodler == null)
+                    {
+                        oNewFodler = new FolderId(WellKnownFolderName.Root);
+                    }
+
                     this.AddRootFolderToTreeView(
                         service,
                         oAppSettings,