diff --git a/lib/email_helper/probe.rb b/lib/email_helper/probe.rb
index 23e4bf711..92d27b668 100644
--- a/lib/email_helper/probe.rb
+++ b/lib/email_helper/probe.rb
@@ -382,6 +382,7 @@ returns on fail
         'Connection refused'                                        => { host: true },
         'Mailbox doesn\'t exist'                                    => { folder: true },
         'Folder doesn\'t exist'                                     => { folder: true },
+        'Unknown Mailbox'                                           => { folder: true },
       }
     end
 
diff --git a/test/browser/admin_channel_email_test.rb b/test/browser/admin_channel_email_test.rb
index 2c6359efb..d77b8ced9 100644
--- a/test/browser/admin_channel_email_test.rb
+++ b/test/browser/admin_channel_email_test.rb
@@ -48,15 +48,19 @@ class AdminChannelEmailTest < TestCase
 
     watch_for(
       css: '.modal',
-      value: 'already exists',
+      value: '(already exists|unknown mailbox)',
     )
 
     click(css: '.modal .js-close')
 
-    # delete
-    click(css: '#content .js-channelDelete')
-    sleep 2
-    click(css: '.modal .js-submit')
+    # delete all channels
+    loop do
+      break if !@browser.find_elements(css: '#content .js-channelDelete')[0]
+      click(css: '#content .js-channelDelete')
+      sleep 2
+      click(css: '.modal .js-submit')
+      sleep 2
+    end
 
     # re-create
     click(css: '#content .js-channelNew')