diff --git a/spec/time-override.coffee b/spec/time-override.coffee
index e301c6add..b68cf55db 100644
--- a/spec/time-override.coffee
+++ b/spec/time-override.coffee
@@ -88,7 +88,7 @@ class TimeOverride
 
   @_fakeSetInterval = (callback, ms) =>
     id = ++@intervalCount
-    action = ->
+    action = =>
       callback()
       @intervalTimeouts[id] = @_fakeSetTimeout(action, ms)
     @intervalTimeouts[id] = @_fakeSetTimeout(action, ms)
diff --git a/src/flux/models/contact.coffee b/src/flux/models/contact.coffee
index 7ba95603a..e60cd5a42 100644
--- a/src/flux/models/contact.coffee
+++ b/src/flux/models/contact.coffee
@@ -111,6 +111,11 @@ class Contact extends Model
     account = AccountStore.accountForEmail(@email)
     return account?
 
+  hasSameDomainAsMe: ->
+    for myEmail in AccountStore.emailAddresses()
+      return true if Utils.emailsHaveSameDomain(@email, myEmail)
+    return false
+
   isMePhrase: ({includeAccountLabel, forceAccountLabel} = {}) ->
     account = AccountStore.accountForEmail(@email)
     return null unless account
diff --git a/src/flux/stores/account-store.coffee b/src/flux/stores/account-store.coffee
index 84e45ad83..8afdf654d 100644
--- a/src/flux/stores/account-store.coffee
+++ b/src/flux/stores/account-store.coffee
@@ -241,6 +241,11 @@ class AccountStore extends NylasStore
   accountForId: (id) =>
     @_cachedGetter "accountForId:#{id}", => _.findWhere(@_accounts, {id})
 
+  emailAddresses: ->
+    addresses = _.pluck((@accounts() ? []), "emailAddress")
+    addresses = addresses.concat(_.pluck((@aliases() ? [])), "email")
+    return addresses
+
   aliases: =>
     @_cachedGetter "aliases", =>
       aliases = []