From 6562d43f5643cc36a4b4db52ee0e9f864125f668 Mon Sep 17 00:00:00 2001
From: Daniel Applebaum <danapple@danapple.com>
Date: Sun, 9 May 2010 15:50:58 +0000
Subject: [PATCH] Cleanup logic for controlling visibility of email field for
 each account.

---
 src/com/fsck/k9/activity/Accounts.java | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/com/fsck/k9/activity/Accounts.java b/src/com/fsck/k9/activity/Accounts.java
index 1dfa33681..10634ca34 100644
--- a/src/com/fsck/k9/activity/Accounts.java
+++ b/src/com/fsck/k9/activity/Accounts.java
@@ -803,12 +803,21 @@ public class Accounts extends K9ListActivity implements OnItemClickListener, OnC
             if (stats != null && account instanceof Account && stats.size >= 0)
             {
                 holder.email.setText(SizeFormatter.formatSize(Accounts.this, stats.size));
+                holder.email.setVisibility(View.VISIBLE);
             }
             else
             {
-                holder.email.setText(account.getEmail());
+                if (account.getEmail().equals(account.getDescription()))
+                {
+                    holder.email.setVisibility(View.GONE);
+                }
+                else
+                {
+                    holder.email.setVisibility(View.VISIBLE);
+                    holder.email.setText(account.getEmail());
+                }
             }
-
+            
             String description = account.getDescription();
             if (description == null || description.length() == 0)
             {
@@ -817,11 +826,6 @@ public class Accounts extends K9ListActivity implements OnItemClickListener, OnC
 
             holder.description.setText(description);
 
-            if (account.getEmail().equals(account.getDescription()))
-            {
-                holder.email.setVisibility(View.GONE);
-            }
-
             Integer unreadMessageCount = null;
             if (stats != null)
             {