diff --git a/app/soapbox/features/account/components/header.js b/app/soapbox/features/account/components/header.js
index 4875dd8a0..d7d80e847 100644
--- a/app/soapbox/features/account/components/header.js
+++ b/app/soapbox/features/account/components/header.js
@@ -5,6 +5,7 @@ import { connect } from 'react-redux';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import PropTypes from 'prop-types';
 import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
+import Icon from 'soapbox/components/icon';
 import Button from 'soapbox/components/button';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { isStaff } from 'soapbox/utils/accounts';
@@ -293,13 +294,10 @@ class Header extends ImmutablePureComponent {
               me && !deactivated &&
               <div className='account__header__extra__buttons'>
                 <ActionButton account={account} />
-                {account.get('id') !== me &&
-                  <Button className='button-alternative-2' onClick={this.props.onMessage}>
-                    <FormattedMessage
-                      id='account.message' defaultMessage='Message' values={{
-                        name: account.get('acct'),
-                      }}
-                    />
+                {account.get('id') !== me && account.getIn(['pleroma', 'accepts_chat_messages'], false) === true &&
+                  <Button className='button-alternative-2' onClick={this.props.onChat}>
+                    <Icon id='comment' />
+                    <FormattedMessage id='account.message' defaultMessage='Message' />
                   </Button>
                 }
                 <DropdownMenuContainer items={menu} icon='ellipsis-v' size={24} direction='right' />
diff --git a/app/soapbox/features/account_timeline/components/header.js b/app/soapbox/features/account_timeline/components/header.js
index c0c30b759..534a12dbc 100644
--- a/app/soapbox/features/account_timeline/components/header.js
+++ b/app/soapbox/features/account_timeline/components/header.js
@@ -72,11 +72,10 @@ export default class Header extends ImmutablePureComponent {
     this.props.onUnblockDomain(domain);
   }
 
-  handleMessage = () => {
-    this.props.onMessage(this.props.account, this.context.router.history);
+  handleChat = () => {
+    this.props.onChat(this.props.account, this.context.router.history);
   }
 
-
   // handleEndorseToggle = () => {
   //   this.props.onEndorseToggle(this.props.account);
   // }
@@ -100,7 +99,7 @@ export default class Header extends ImmutablePureComponent {
           onBlock={this.handleBlock}
           onMention={this.handleMention}
           onDirect={this.handleDirect}
-          onMessage={this.handleMessage}
+          onChat={this.handleChat}
           onReblogToggle={this.handleReblogToggle}
           onReport={this.handleReport}
           onMute={this.handleMute}
diff --git a/app/soapbox/features/account_timeline/containers/header_container.js b/app/soapbox/features/account_timeline/containers/header_container.js
index f254818d3..504675a42 100644
--- a/app/soapbox/features/account_timeline/containers/header_container.js
+++ b/app/soapbox/features/account_timeline/containers/header_container.js
@@ -134,7 +134,7 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
     }));
   },
 
-  onMessage(account, router) {
+  onChat(account, router) {
     dispatch(startChat(account.get('id')));
   },
 });