diff --git a/src/console/main.vala b/src/console/main.vala
index 4a8f7ab3..68a22518 100644
--- a/src/console/main.vala
+++ b/src/console/main.vala
@@ -92,6 +92,7 @@ class ImapConsole : Gtk.Window {
         "exit",
         "quit",
         "gmail",
+        "yahoo",
         "keepalive",
         "status",
         "preview",
@@ -189,6 +190,12 @@ class ImapConsole : Gtk.Window {
                         connect_cmd("connect", fake_args);
                     break;
                     
+                    case "yahoo":
+                        string[] fake_args = new string[1];
+                        fake_args[0] = "imap.mail.yahoo.com:993";
+                        connect_cmd("connect", fake_args);
+                    break;
+                    
                     case "keepalive":
                         keepalive(cmd, args);
                     break;
diff --git a/src/engine/imap/decoders/imap-select-examine-results.vala b/src/engine/imap/decoders/imap-select-examine-results.vala
index bfa46d66..8ecf30d0 100644
--- a/src/engine/imap/decoders/imap-select-examine-results.vala
+++ b/src/engine/imap/decoders/imap-select-examine-results.vala
@@ -118,7 +118,7 @@ public class Geary.Imap.SelectExamineResults : Geary.Imap.CommandResults {
                     break;
                 }
             } catch (ImapError ierr) {
-                message("SELECT/EXAMINE decode error for \"%s\": %s", data.to_string(), ierr.message);
+                debug("SELECT/EXAMINE: unable to decode \"%s\", ignored: %s", data.to_string(), ierr.message);
             }
         }