diff --git a/imap/src/client/mod.rs b/imap/src/client/mod.rs
index ed6c83e..8e1a5d9 100644
--- a/imap/src/client/mod.rs
+++ b/imap/src/client/mod.rs
@@ -223,6 +223,7 @@ impl ClientAuthenticated {
 
     /// Runs the IDLE command
     #[cfg(feature = "rfc2177-idle")]
+    #[cfg_attr(docsrs, doc(cfg(feature = "rfc2177-idle")))]
     pub async fn idle(&mut self) -> Result<ResponseStream> {
         let cmd = Command::Idle;
         let stream = self.execute(cmd).await?;
diff --git a/imap/src/command.rs b/imap/src/command.rs
index eca2891..4c72431 100644
--- a/imap/src/command.rs
+++ b/imap/src/command.rs
@@ -29,6 +29,7 @@ pub enum Command {
     },
 
     #[cfg(feature = "rfc2177-idle")]
+    #[cfg_attr(docsrs, doc(cfg(feature = "rfc2177-idle")))]
     Idle,
 }
 
diff --git a/src/mail/mod.rs b/src/mail/mod.rs
index be67b79..d4176c0 100644
--- a/src/mail/mod.rs
+++ b/src/mail/mod.rs
@@ -144,6 +144,7 @@ async fn imap_main(acct: MailAccountConfig, mail2ui_tx: UnboundedSender<MailEven
             let _ = mail2ui_tx.send(MailEvent::FolderList(folder_list));
 
             let message_uids = authed.uid_search().await?;
+            let message_uids = message_uids.into_iter().take(20).collect::<Vec<_>>();
             let message_list = authed.uid_fetch(&message_uids).await?;
             let _ = mail2ui_tx.send(MailEvent::MessageList(message_list));