diff --git a/src/com/fsck/k9/Account.java b/src/com/fsck/k9/Account.java
index 4328a732e..d6ea19417 100644
--- a/src/com/fsck/k9/Account.java
+++ b/src/com/fsck/k9/Account.java
@@ -504,6 +504,10 @@ public class Account implements BaseAccount {
 
         cacheChips();
 
+        // Use email address as account description if necessary
+        if (mDescription == null) {
+            mDescription = getEmail();
+        }
     }
 
     protected synchronized void delete(Preferences preferences) {