From e6b1575a458addbe4c01b7662474eeee3a721236 Mon Sep 17 00:00:00 2001
From: Tony Mantler <nicoya@google.com>
Date: Mon, 3 Mar 2014 10:52:56 -0800
Subject: [PATCH] Use email address instead of trying to reconstruct it

b/13280168

Change-Id: I0391dd8c169aa0185c7ff9f79970bcb5595fe84f
---
 src/com/android/email/activity/setup/AccountSetupFinal.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/android/email/activity/setup/AccountSetupFinal.java b/src/com/android/email/activity/setup/AccountSetupFinal.java
index 99af7b5ee..10dbb4de4 100644
--- a/src/com/android/email/activity/setup/AccountSetupFinal.java
+++ b/src/com/android/email/activity/setup/AccountSetupFinal.java
@@ -914,7 +914,7 @@ public class AccountSetupFinal extends AccountSetupActivity
         final HostAuth recvAuth = account.getOrCreateHostAuthRecv(this);
         recvAuth.setConnection(protocol, recvAuth.mAddress, recvAuth.mPort, recvAuth.mFlags);
 
-        recvAuth.mLogin = recvAuth.mLogin + "@" + recvAuth.mAddress;
+        recvAuth.mLogin = mSetupData.getEmail();
         setDefaultsForProtocol(account);
         proceed();
     }