diff --git a/internal_packages/composer-signature/lib/preferences-signatures.jsx b/internal_packages/composer-signature/lib/preferences-signatures.jsx
index 0292d926f..bbe91b04d 100644
--- a/internal_packages/composer-signature/lib/preferences-signatures.jsx
+++ b/internal_packages/composer-signature/lib/preferences-signatures.jsx
@@ -42,11 +42,11 @@ export default class PreferencesSignatures extends React.Component {
 
   _renderAccountPicker() {
     const options = this.state.accounts.map(account =>
-      <option value={account.id} key={account.id}>{account.emailAddress}</option>
+      <option value={account.id} key={account.id}>{account.label}</option>
     );
 
     return (
-      <select value={this.state.currentAccountId} onChange={this._onSelectAccount}>
+      <select value={this.state.currentAccountId} onChange={this._onSelectAccount} style={{minWidth: 200}}>
         {options}
       </select>
     );
diff --git a/internal_packages/preferences/lib/tabs/preferences-mail-rules.jsx b/internal_packages/preferences/lib/tabs/preferences-mail-rules.jsx
index 7b5860525..8b0c21ab8 100644
--- a/internal_packages/preferences/lib/tabs/preferences-mail-rules.jsx
+++ b/internal_packages/preferences/lib/tabs/preferences-mail-rules.jsx
@@ -134,14 +134,14 @@ class PreferencesMailRules extends React.Component {
 
   _renderAccountPicker() {
     const options = this.state.accounts.map(account =>
-      <option value={account.accountId} key={account.accountId}>{account.emailAddress}</option>
+      <option value={account.accountId} key={account.accountId}>{account.label}</option>
     );
 
     return (
       <select
         value={this.state.currentAccount.accountId}
         onChange={this._onSelectAccount}
-        style={{margin: 0}}
+        style={{margin: 0, minWidth: 200}}
       >
         {options}
       </select>