diff --git a/CHANGELOG.md b/CHANGELOG.md
index 372e83c..188134b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 
 - Get signature from file [#135]
+- [**BREAKING**] Split `idle` command into two commands:
+  - `notify`: Runs `notify-cmd` when a new message arrives to the server
+  - `watch`: Runs `watch-cmds` when any change occurs on the server
 
 ## [0.3.1] - 2021-05-04
 
diff --git a/tests/imap_test.rs b/tests/imap_test.rs
index 8703872..bee0664 100644
--- a/tests/imap_test.rs
+++ b/tests/imap_test.rs
@@ -12,6 +12,7 @@ fn get_account(addr: &str) -> Account {
         default_page_size: None,
         default: Some(true),
         email: addr.into(),
+        watch_cmds: None,
         imap_host: String::from("localhost"),
         imap_port: 3993,
         imap_starttls: Some(false),
@@ -73,7 +74,11 @@ fn msg() {
     // List messages
     // TODO: check non-existance of \Seen flag
     let msgs = imap_conn.list_msgs("INBOX", &10, &0).unwrap();
-    let msgs = Msgs::from(&msgs);
+    let msgs = if let Some(ref fetches) = msgs {
+        Msgs::from(fetches)
+    } else {
+        Msgs::new()
+    };
     assert_eq!(msgs.0.len(), 2);
 
     let msg_a = msgs
@@ -105,10 +110,7 @@ fn msg() {
         .add_flags("INBOX", &msg_b.uid.to_string(), "\\Deleted")
         .unwrap();
     imap_conn.expunge("INBOX").unwrap();
-    assert!(match imap_conn.list_msgs("INBOX", &10, &0) {
-        Err(err) => err.to_string() == "The `INBOX` mailbox is empty",
-        Ok(_) => false,
-    });
+    assert!(imap_conn.list_msgs("INBOX", &10, &0).unwrap().is_none());
 
     // Logout
     imap_conn.logout();
diff --git a/wiki b/wiki
index 230c6d7..c71c547 160000
--- a/wiki
+++ b/wiki
@@ -1 +1 @@
-Subproject commit 230c6d79386947e7bf731a82492ada642100afde
+Subproject commit c71c5474fa53632757a90831b22ee1897f394035