diff --git a/framework/Imap_Client/test/Horde/Imap/Client/MailboxTest.php b/framework/Imap_Client/test/Horde/Imap/Client/MailboxTest.php
index 4ea40206a53..7e493b66b5c 100644
--- a/framework/Imap_Client/test/Horde/Imap/Client/MailboxTest.php
+++ b/framework/Imap_Client/test/Horde/Imap/Client/MailboxTest.php
@@ -118,4 +118,32 @@ public function testInboxCaseInsensitive()
         );
     }
 
+    public function testBug13825()
+    {
+        $mbox = 'INBOX.!  Astrid"';
+
+        $ob = new Horde_Imap_Client_Mailbox($mbox);
+
+        $this->assertEquals(
+            $ob,
+            Horde_Imap_Client_Mailbox::get($mbox)
+        );
+        $this->assertEquals(
+            $ob,
+            Horde_Imap_Client_Mailbox::get($ob)
+        );
+
+        $format = new Horde_Imap_Client_Data_Format_Mailbox($ob);
+        $this->assertEquals(
+            '"' . $mbox . '"',
+            $format->escape()
+        );
+
+        $format2 = new Horde_Imap_Client_Data_Format_Mailbox_Utf8($ob);
+        $this->assertEquals(
+            '"' . $mbox . '"',
+            $format2->escape()
+        );
+    }
+
 }