From 0de50b476c42019dd68cac6028c3171e24603b81 Mon Sep 17 00:00:00 2001
From: Ben Gotow <bengotow@gmail.com>
Date: Fri, 15 Apr 2016 19:05:54 -0400
Subject: [PATCH] fix(default-alias): Show primary email instead of "None",
 clarify only for new messages currently

---
 .../lib/tabs/preferences-account-details.jsx           |  4 ++--
 .../preferences/stylesheets/preferences-accounts.less  | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/internal_packages/preferences/lib/tabs/preferences-account-details.jsx b/internal_packages/preferences/lib/tabs/preferences-account-details.jsx
index 157d0aaea..33b42149d 100644
--- a/internal_packages/preferences/lib/tabs/preferences-account-details.jsx
+++ b/internal_packages/preferences/lib/tabs/preferences-account-details.jsx
@@ -123,9 +123,9 @@ class PreferencesAccountDetails extends Component {
     if (aliases.length > 0) {
       return (
         <div className="default-alias-selector">
-          <span>Default alias: </span>
+          <div>Default for new messages:</div>
           <select value={defaultAlias} onChange={this._onDefaultAliasSelected}>
-            <option>None</option>
+            <option value="None">{`${account.name} <${account.emailAddress}>`}</option>
             {aliases.map((alias, idx)=> <option key={`alias-${idx}`} value={alias}>{alias}</option>)}
           </select>
         </div>
diff --git a/internal_packages/preferences/stylesheets/preferences-accounts.less b/internal_packages/preferences/stylesheets/preferences-accounts.less
index 49a589e8a..9693ed145 100644
--- a/internal_packages/preferences/stylesheets/preferences-accounts.less
+++ b/internal_packages/preferences/stylesheets/preferences-accounts.less
@@ -102,13 +102,13 @@
         }
 
         .default-alias-selector {
-          font-size: 0.9em;
-          display:flex;
-          align-items: baseline;
-          padding-top: @padding-base-vertical;
+          padding-top: @padding-base-vertical * 3;
+          padding-bottom: @padding-base-vertical;
 
           &>select {
-            flex: 1;
+            font-size: 0.9em;
+            margin-left:0;
+            width: 100%;
           }
         }
       }