diff --git a/src/engine/api/geary-folder.vala b/src/engine/api/geary-folder.vala
index 63772d0f..2fd549d9 100644
--- a/src/engine/api/geary-folder.vala
+++ b/src/engine/api/geary-folder.vala
@@ -552,12 +552,11 @@ public abstract class Geary.Folder : BaseObject {
      */
     public abstract async Geary.Email fetch_email_async(Geary.EmailIdentifier email_id,
         Geary.Email.Field required_fields, ListFlags flags, Cancellable? cancellable = null) throws Error;
-    
+
     /**
      * Used for debugging.  Should not be used for user-visible labels.
      */
     public virtual string to_string() {
-        return "%s:%s".printf(account.to_string(), path.to_string());
+        return "%s:%s".printf(this.account.information.id, this.path.to_string());
     }
 }
-
diff --git a/src/engine/imap-db/imap-db-account.vala b/src/engine/imap-db/imap-db-account.vala
index 870f63a7..6870dfa7 100644
--- a/src/engine/imap-db/imap-db-account.vala
+++ b/src/engine/imap-db/imap-db-account.vala
@@ -233,11 +233,10 @@ private class Geary.ImapDB.Account : BaseObject {
 
     public Account(Geary.AccountInformation account_information) {
         this.account_information = account_information;
-        contact_store = new ImapEngine.ContactStore(this);
-        
-        name = "IMAP database account for %s".printf(account_information.imap_credentials.user);
+        this.contact_store = new ImapEngine.ContactStore(this);
+        this.name = account_information.id + ":db";
     }
-    
+
     private void check_open() throws Error {
         if (db == null)
             throw new EngineError.OPEN_REQUIRED("Database not open");
diff --git a/src/engine/imap/api/imap-account.vala b/src/engine/imap/api/imap-account.vala
index da8a066b..fec5610f 100644
--- a/src/engine/imap/api/imap-account.vala
+++ b/src/engine/imap/api/imap-account.vala
@@ -55,9 +55,9 @@ private class Geary.Imap.Account : BaseObject {
     public signal void login_failed(Geary.Credentials? cred, StatusResponse? response);
 
     public Account(Geary.AccountInformation account_information) {
-        name = "IMAP Account for %s".printf(account_information.imap_credentials.to_string());
         this.account_information = account_information;
         this.session_mgr = new ClientSessionManager(account_information);
+        this.name = account.id + ":imap";
         this.session_mgr.ready.connect(on_session_ready);
         this.session_mgr.login_failed.connect(on_login_failed);
     }