fix(default-alias):Show correct list of accounts and aliases in composer

internal_packages/message-list/lib/message-controls.cjsx

@@ -73,13 +73,6 @@ class MessageControls extends React.Component
   _onForward: =>
     Actions.composeForward(thread: @props.thread, message: @props.message)
 
-  _replyType: =>
-    emails = @props.message.to.map (item) -> item.email.toLowerCase().trim()
-    myEmail = @_account()?.me().email.toLowerCase().trim()
-    if @props.message.cc.length is 0 and @props.message.to.length is 1 and emails[0] is myEmail
-      return "reply"
-    else return "reply-all"
-
   _onShowActionsMenu: =>
     SystemMenu = remote.require('menu')
     SystemMenuItem = remote.require('menu-item')

src/flux/models/account.coffee

@@ -69,20 +69,23 @@ class Account extends Model
 
   # Returns a {Contact} model that represents the current user.
   me: ->
-    if @defaultAlias
-      return @meUsingAlias(@defaultAlias)
-    else
-      Contact = require './contact'
-      return new Contact
-        accountId: @id
-        name: @name
-        email: @emailAddress
+    Contact = require './contact'
+    return new Contact
+      accountId: @id
+      name: @name
+      email: @emailAddress
 
   meUsingAlias: (alias) ->
     Contact = require './contact'
     return @me() unless alias
     return Contact.fromString(alias, accountId: @id)
 
+  defaultMe: ->
+    if @defaultAlias
+      return @meUsingAlias(@defaultAlias)
+    else
+      return @me()
+
   usesLabels: ->
     @organizationUnit is "label"
 

src/flux/stores/draft-store.coffee

@@ -286,7 +286,7 @@ class DraftStore
     account = AccountStore.accountForId(thread.accountId)
     throw new Error("Cannot find #{thread.accountId}") unless account
     return new Message _.extend {}, attributes,
-      from: [account.me()]
+      from: [account.defaultMe()]
       date: (new Date)
       draft: true
       pristine: true
@@ -385,7 +385,7 @@ class DraftStore
 
     draft = new Message
       body: ""
-      from: [account.me()]
+      from: [account.defaultMe()]
       date: (new Date)
       draft: true
       pristine: true
@@ -463,7 +463,7 @@ class DraftStore
     draft = new Message
       body: query.body || ''
       subject: query.subject || '',
-      from: [account.me()]
+      from: [account.defaultMe()]
       date: (new Date)
       draft: true
       pristine: true