diff --git a/Cargo.toml b/Cargo.toml
index 4ebeb9d..4ecc0e1 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "imap"
-version = "1.0.2"
+version = "2.0.0"
 authors = ["Matt McCoy <mattnenterprise@yahoo.com>",
            "Jon Gjengset <jon@thesquareplanet.com>"]
 documentation = "https://docs.rs/imap/"
@@ -29,9 +29,9 @@ default = ["tls"]
 native-tls = { version = "0.2.2", optional = true }
 regex = "1.0"
 bufstream = "0.1"
-imap-proto = "0.9.0"
+imap-proto = "0.10.0"
 nom = "5.0"
-base64 = "0.10"
+base64 = "0.11"
 chrono = "0.4"
 lazy_static = "1.4"
 
diff --git a/src/parse.rs b/src/parse.rs
index 7c79b59..3a574b9 100644
--- a/src/parse.rs
+++ b/src/parse.rs
@@ -252,7 +252,9 @@ pub fn parse_mailbox(
                             .flags
                             .extend(flags.into_iter().map(String::from).map(Flag::from));
                     }
-                    MailboxDatum::List { .. } => {}
+                    MailboxDatum::List { .. }
+                    | MailboxDatum::MetadataSolicited { .. }
+                    | MailboxDatum::MetadataUnsolicited { .. } => {}
                 }
             }
             Ok((rest, Response::Expunge(n))) => {
diff --git a/tests/imap_integration.rs b/tests/imap_integration.rs
index 8b1c629..f639684 100644
--- a/tests/imap_integration.rs
+++ b/tests/imap_integration.rs
@@ -139,17 +139,17 @@ fn inbox() {
     assert_ne!(fetch.uid, None);
     assert_eq!(fetch.size, Some(138));
     let e = fetch.envelope().unwrap();
-    assert_eq!(e.subject, Some("My first e-mail"));
+    assert_eq!(e.subject, Some(&b"My first e-mail"[..]));
     assert_ne!(e.from, None);
     assert_eq!(e.from.as_ref().unwrap().len(), 1);
     let from = &e.from.as_ref().unwrap()[0];
-    assert_eq!(from.mailbox, Some("sender"));
-    assert_eq!(from.host, Some("localhost"));
+    assert_eq!(from.mailbox, Some(&b"sender"[..]));
+    assert_eq!(from.host, Some(&b"localhost"[..]));
     assert_ne!(e.to, None);
     assert_eq!(e.to.as_ref().unwrap().len(), 1);
     let to = &e.to.as_ref().unwrap()[0];
-    assert_eq!(to.mailbox, Some("inbox"));
-    assert_eq!(to.host, Some("localhost"));
+    assert_eq!(to.mailbox, Some(&b"inbox"[..]));
+    assert_eq!(to.host, Some(&b"localhost"[..]));
     let date_opt = fetch.internal_date();
     assert!(date_opt.is_some());
 
@@ -207,7 +207,7 @@ fn inbox_uid() {
     let fetch = &fetch[0];
     assert_eq!(fetch.uid, Some(uid));
     let e = fetch.envelope().unwrap();
-    assert_eq!(e.subject, Some("My first e-mail"));
+    assert_eq!(e.subject, Some(&b"My first e-mail"[..]));
     let date_opt = fetch.internal_date();
     assert!(date_opt.is_some());