Merge: #25591: improve imap tests.