Use email address instead of trying to reconstruct it

b/13280168

Change-Id: I0391dd8c169aa0185c7ff9f79970bcb5595fe84f

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();
     }