Make sure we also check for "account" to be backwards compatible

Apps may supply the account they want to send mail from in the
Utils.account extra

Fixes b/7964518 [Send email] - Error in log when tapping edit email in answer card - Could not create an account from this input

Change-Id: I6b3249a0704ece7052866eb498cfee58c23cb1cb
diff --git a/src/com/android/mail/compose/ComposeActivity.java b/src/com/android/mail/compose/ComposeActivity.java
index 04b3939..a746c56 100644
--- a/src/com/android/mail/compose/ComposeActivity.java
+++ b/src/com/android/mail/compose/ComposeActivity.java
@@ -499,7 +499,9 @@
                     return account;
                 }
             }
-            accountExtra = intent.getStringExtra(EXTRA_SELECTED_ACCOUNT);
+            accountExtra = intent.hasExtra(Utils.EXTRA_ACCOUNT) ?
+                    intent.getStringExtra(Utils.EXTRA_ACCOUNT) :
+                        intent.getStringExtra(EXTRA_SELECTED_ACCOUNT);
         }
         if (account == null) {
             MailAppProvider provider = MailAppProvider.getInstance();
diff --git a/src/com/android/mail/providers/Account.java b/src/com/android/mail/providers/Account.java
index 150807d..47403fb 100644
--- a/src/com/android/mail/providers/Account.java
+++ b/src/com/android/mail/providers/Account.java
@@ -255,7 +255,7 @@
             final String type = (String) json.get(UIProvider.AccountColumns.TYPE);
             return new Account(name, type, serializedAccount);
         } catch (JSONException e) {
-            LogUtils.e(LOG_TAG, e, "Could not create an account from this input: \"%s\"",
+            LogUtils.w(LOG_TAG, e, "Could not create an account from this input: \"%s\"",
                     serializedAccount);
             return null;
         }