diff --git a/app/controllers/api/v1/chat_conversation_accounts/blocked_chat_accounts_controller.rb b/app/controllers/api/v1/chat_conversation_accounts/blocked_chat_accounts_controller.rb
index 2ff84ee2..a7b52de0 100644
--- a/app/controllers/api/v1/chat_conversation_accounts/blocked_chat_accounts_controller.rb
+++ b/app/controllers/api/v1/chat_conversation_accounts/blocked_chat_accounts_controller.rb
@@ -18,12 +18,12 @@ class Api::V1::ChatConversationAccounts::BlockedChatAccountsController < Api::Ba
 
   def paginated_blocks
     @paginated_blocks ||= ChatBlock.eager_load(target_account: :account_stat)
-                               .where(account: current_account)
-                               .paginate_by_max_id(
-                                 limit_param(DEFAULT_ACCOUNTS_LIMIT),
-                                 params[:max_id],
-                                 params[:since_id]
-                               )
+                                  .where(account: current_account)
+                                  .paginate_by_max_id(
+                                    limit_param(DEFAULT_ACCOUNTS_LIMIT),
+                                    params[:max_id],
+                                    params[:since_id]
+                                  )
   end
 
   def insert_pagination_headers
diff --git a/app/controllers/api/v1/chat_conversation_accounts_controller.rb b/app/controllers/api/v1/chat_conversation_accounts_controller.rb
index e1bd8e22..35968577 100644
--- a/app/controllers/api/v1/chat_conversation_accounts_controller.rb
+++ b/app/controllers/api/v1/chat_conversation_accounts_controller.rb
@@ -5,43 +5,47 @@ class Api::V1::ChatConversationAccountsController < Api::BaseController
   before_action -> { doorkeeper_authorize! :write, :'write:chats' }
 
   before_action :require_user!
-  before_action :set_account
+  before_action :set_account, only: [:block_messenger, :unblock_messenger, :messenger_block_relationships]
+  before_action :check_account_suspension, only: [:block_messenger, :unblock_messenger, :messenger_block_relationships]
+  before_action :set_chat_conversation, except: [:block_messenger, :unblock_messenger, :messenger_block_relationships]
 
   def block_messenger
-    BlockMessengerService.new.call(current_user.account, @account)
-    render json: @account, serializer: REST::RelationshipSerializer, relationships: relationships
+    @block = BlockChatMessengerService.new.call(current_user.account, @account)
+    render json: @account,
+           serializer: REST::ChatMessengerBlockedSerializer,
+           chat_blocking: true
   end
 
   def unblock_messenger
-    UnblockMessengerService.new.call(current_user.account, @account)
-    render json: @account, serializer: REST::RelationshipSerializer, relationships: relationships
+    UnblockChatMessengerService.new.call(current_user.account, @account)
+    render json: @account,
+           serializer: REST::ChatMessengerBlockedSerializer,
+           chat_blocking: false
+  end
+
+  def messenger_block_relationships
+    chat_blocking = current_user.account.chat_blocking?(@account)
+    chat_blocked_by = current_user.account.chat_blocked_by?(@account, current_account)
+    render json: @account,
+           serializer: REST::ChatMessengerBlockedSerializer,
+           chat_blocking: chat_blocking,
+           chat_blocked_by: chat_blocked_by
   end
 
   def mute_chat_conversation
-    @chat_conversation_account.is_muted = true
-    @chat_conversation_account.save!
+    @chat_conversation_account.update!(is_muted: true)
     render json: @chat_conversation_account, serializer: REST::ChatConversationAccountSerializer
   end
 
   def unmute_chat_conversation
-    @chat_conversation_account.is_muted = false
-    @chat_conversation_account.save!
+    @chat_conversation_account.update!(is_muted: false)
     render json: @chat_conversation_account, serializer: REST::ChatConversationAccountSerializer
   end
 
-  def set_expiration_policy
-    if current_user.account.is_pro
-      # : todo :
-      render json: @chat_conversation_account, serializer: REST::ChatConversationAccountSerializer
-    else
-      render json: { error: 'You need to be a GabPRO member to access this' }, status: 422
-    end
-  end
-
   private
 
   def set_account
-    @account = Account.find(params[:id])
+    @account = Account.find(params[:account_id])
   end
 
   def set_chat_conversation
diff --git a/app/controllers/api/v1/chat_conversation_controller.rb b/app/controllers/api/v1/chat_conversation_controller.rb
index 13d48583..8a146645 100644
--- a/app/controllers/api/v1/chat_conversation_controller.rb
+++ b/app/controllers/api/v1/chat_conversation_controller.rb
@@ -6,7 +6,13 @@ class Api::V1::ChatConversationController < Api::BaseController
 
   before_action :require_user!
   before_action :set_account, only: :create
-  before_action :set_chat_conversation, only: [:show, :mark_chat_conversation_approved, :mark_chat_conversation_hidden, :mark_chat_conversation_read]
+  before_action :set_chat_conversation, only: [
+      :show,
+      :mark_chat_conversation_approved,
+      :mark_chat_conversation_hidden,
+      :mark_chat_conversation_read,
+      :set_expiration_policy
+    ]
 
   def show
     render json: {}, each_serializer: REST::ChatConversationAccountSerializer
@@ -43,6 +49,33 @@ class Api::V1::ChatConversationController < Api::BaseController
     end
   end
 
+  def set_expiration_policy
+    if current_user.account.is_pro
+      case params[:expiration]
+        when 'five_minutes'
+          @expires_at = ChatConversationAccount::EXPIRATION_POLICY_MAP[:five_minutes]
+        when 'one_hour'
+          @expires_at = ChatConversationAccount::EXPIRATION_POLICY_MAP[:one_hour]
+        when 'six_hours'
+          @expires_at = ChatConversationAccount::EXPIRATION_POLICY_MAP[:six_hours]
+        when 'one_day'
+          @expires_at = ChatConversationAccount::EXPIRATION_POLICY_MAP[:one_day]
+        when 'three_days'
+          @expires_at = ChatConversationAccount::EXPIRATION_POLICY_MAP[:three_days]
+        when 'one_week'
+          @expires_at = ChatConversationAccount::EXPIRATION_POLICY_MAP[:one_week]
+        else
+          @expires_at = nil
+      end
+      puts "tilly @expires_at: " + @expires_at.inspect
+      @chat_conversation_account.chat_message_expiration_policy = @expires_at
+      @chat_conversation_account.save!
+      render json: @chat_conversation_account, serializer: REST::ChatConversationAccountSerializer
+    else
+      render json: { error: 'You need to be a GabPRO member to access this' }, status: 422
+    end
+  end
+
   private
 
   def find_or_create_conversation
diff --git a/app/controllers/api/v1/chat_conversations/messages_controller.rb b/app/controllers/api/v1/chat_conversations/messages_controller.rb
index c0e0aa13..8cd8f87b 100644
--- a/app/controllers/api/v1/chat_conversations/messages_controller.rb
+++ b/app/controllers/api/v1/chat_conversations/messages_controller.rb
@@ -16,7 +16,11 @@ class Api::V1::ChatConversations::MessagesController < Api::BaseController
 
   def destroy_all
     if current_user.account.is_pro
-      @chat_conversation_account = PurgeChatMessagesService.new.call(current_user.account, @chat_conversation)
+      PurgeChatMessagesService.new.call(current_user.account, @chat_conversation)
+      @chat_conversation_account = ChatConversationAccount.where(
+        account: current_user.account,
+        chat_conversation: @chat_conversation
+      ).first
       render json: @chat_conversation_account, serializer: REST::ChatConversationAccountSerializer
     else
       render json: { error: 'You need to be a GabPRO member to access this' }, status: 422
diff --git a/app/controllers/api/v1/chat_messages_controller.rb b/app/controllers/api/v1/chat_messages_controller.rb
index ec6a1b56..91808668 100644
--- a/app/controllers/api/v1/chat_messages_controller.rb
+++ b/app/controllers/api/v1/chat_messages_controller.rb
@@ -5,6 +5,7 @@ class Api::V1::ChatMessagesController < Api::BaseController
   before_action -> { doorkeeper_authorize! :write, :'write:chats' }
 
   before_action :require_user!
+  before_action :set_chat_message, only: :destroy
 
   def create
     @chat_conversation = ChatConversation.find(chat_params[:chat_conversation_id])
@@ -13,8 +14,9 @@ class Api::V1::ChatMessagesController < Api::BaseController
   end
 
   def destroy
-    @chat = DeleteChatMessageService.new.call(current_user.account, params[:id])
-    render json: @chat, serializer: REST::ChatMessageSerializer
+    return not_found if @chatMessage.nil?
+    DeleteChatMessageService.new.call(@chatMessage)
+    render json: @chatMessage, serializer: REST::ChatMessageSerializer
   end
 
   private
@@ -23,4 +25,8 @@ class Api::V1::ChatMessagesController < Api::BaseController
     params.permit(:text, :chat_conversation_id)
   end
 
+  def set_chat_message
+    @chatMessage = ChatMessage.where(from_account: current_user.account).find(params[:id])
+  end
+
 end
diff --git a/app/javascript/gabsocial/actions/chat_conversation_accounts.js b/app/javascript/gabsocial/actions/chat_conversation_accounts.js
index e895a19d..10e68ba5 100644
--- a/app/javascript/gabsocial/actions/chat_conversation_accounts.js
+++ b/app/javascript/gabsocial/actions/chat_conversation_accounts.js
@@ -20,7 +20,7 @@ export const UNBLOCK_CHAT_MESSAGER_REQUEST = 'UNBLOCK_CHAT_MESSAGER_REQUEST'
 export const UNBLOCK_CHAT_MESSAGER_SUCCESS = 'UNBLOCK_CHAT_MESSAGER_SUCCESS'
 export const UNBLOCK_CHAT_MESSAGER_FAIL    = 'UNBLOCK_CHAT_MESSAGER_FAIL'
 
-export const IS_CHAT_MESSENGER_BLOCKED_SUCCESS = 'IS_CHAT_MESSENGER_BLOCKED_SUCCESS'
+export const FETCH_CHAT_MESSENGER_BLOCKING_RELATIONSHIPS_SUCCESS = 'FETCH_CHAT_MESSENGER_BLOCKING_RELATIONSHIPS_SUCCESS'
 
 //
 
@@ -36,13 +36,12 @@ export const UNMUTE_CHAT_CONVERSATION_FAIL    = 'UNMUTE_CHAT_CONVERSATION_FAIL'
  * 
  */
 export const blockChatMessenger = (accountId) => (dispatch, getState) => {
-  console.log("blockChatMessenger:", accountId)
   if (!me || !accountId) return
 
   dispatch(blockChatMessengerRequest(accountId))
   
-  api(getState).post(`/api/v1/chat_conversation_accounts/${accountId}/block_messenger`).then((response) => {
-    dispatch(blockChatMessengerSuccess())
+  api(getState).post(`/api/v1/chat_conversation_accounts/_/block_messenger`, { account_id: accountId }).then((response) => {
+    dispatch(blockChatMessengerSuccess(response.data))
   }).catch((error) => {
     dispatch(blockChatMessengerFail(accountId, error))
   })
@@ -53,8 +52,9 @@ const blockChatMessengerRequest = (accountId) => ({
   accountId,
 })
 
-const blockChatMessengerSuccess = () => ({
+const blockChatMessengerSuccess = (data) => ({
   type: BLOCK_CHAT_MESSAGER_SUCCESS,
+  data,
   showToast: true,
 })
 
@@ -73,8 +73,8 @@ export const unblockChatMessenger = (accountId) => (dispatch, getState) => {
 
   dispatch(unblockChatMessengerRequest(accountId))
 
-  api(getState).post(`/api/v1/chat_conversation_accounts/${accountId}/unblock_messenger`).then((response) => {
-    dispatch(unblockChatMessengerSuccess())
+  api(getState).post(`/api/v1/chat_conversation_accounts/_/unblock_messenger`, { account_id: accountId }).then((response) => {
+    dispatch(unblockChatMessengerSuccess(response.data))
   }).catch((error) => {
     dispatch(unblockChatMessengerFail(accountId, error))
   })
@@ -85,8 +85,9 @@ const unblockChatMessengerRequest = (accountId) => ({
   accountId,
 })
 
-const unblockChatMessengerSuccess = () => ({
+const unblockChatMessengerSuccess = (data) => ({
   type: UNBLOCK_CHAT_MESSAGER_SUCCESS,
+  data,
   showToast: true,
 })
 
@@ -101,16 +102,16 @@ const unblockChatMessengerFail = (accountId, error) => ({
  * @description Check if a chat messenger is blocked by the current user account.
  * @param {String} accountId
  */
-export const isChatMessengerBlocked = (accountId) => (dispatch, getState) => {
+export const fetchMessengerBlockingRelationships = (accountId) => (dispatch, getState) => {
   if (!me || !accountId) return
 
-  api(getState).post(`/api/v1/chat_conversation_accounts/${accountId}/is_messenger_blocked`).then((response) => {
-    dispatch(isChatMessengerBlockedSuccess(response.data))
+  api(getState).post(`/api/v1/chat_conversation_accounts/_/messenger_block_relationships`, { account_id: accountId }).then((response) => {
+    dispatch(fetchMessengerBlockingRelationshipsSuccess(response.data))
   })
 }
 
-const isChatMessengerBlockedSuccess = (data) => ({
-  type: IS_CHAT_MESSENGER_BLOCKED_SUCCESS,
+const fetchMessengerBlockingRelationshipsSuccess = (data) => ({
+  type: FETCH_CHAT_MESSENGER_BLOCKING_RELATIONSHIPS_SUCCESS,
   data,
 })
 
@@ -193,7 +194,7 @@ export const muteChatConversation = (chatConversationId) => (dispatch, getState)
   api(getState).post(`/api/v1/chat_conversation_accounts/${chatConversationId}/mute_chat_conversation`).then((response) => {
     dispatch(muteChatConversationSuccess(response.data))
   }).catch((error) => {
-    dispatch(muteChatMessengerFail(error))
+    dispatch(muteChatConversationFail(error))
   })
 }
 
diff --git a/app/javascript/gabsocial/actions/chat_conversations.js b/app/javascript/gabsocial/actions/chat_conversations.js
index 36ac51a1..3386009d 100644
--- a/app/javascript/gabsocial/actions/chat_conversations.js
+++ b/app/javascript/gabsocial/actions/chat_conversations.js
@@ -389,9 +389,9 @@ export const readChatConversationFail = () => ({
  * 
  */
 export const setChatConversationExpiration = (chatConversationId, expiration) => (dispatch, getState) => {
-  if (!me|| !chatConversationId || !expiration) return
+  if (!me|| !chatConversationId) return
 
-  dispatch(setChatConversationExpirationFetch(chatConversation))
+  dispatch(setChatConversationExpirationFetch(chatConversationId))
 
   api(getState).post(`/api/v1/chat_conversation/${chatConversationId}/set_expiration_policy`, {
     expiration,
@@ -400,18 +400,18 @@ export const setChatConversationExpiration = (chatConversationId, expiration) =>
   }).catch((error) => dispatch(setChatConversationExpirationFail(error)))
 }
 
-export const setChatConversationExpirationFetch = (chatConversation) => ({
+export const setChatConversationExpirationFetch = (chatConversationId) => ({
   type: SET_CHAT_CONVERSATION_EXPIRATION_REQUEST,
-  chatConversation,
+  chatConversationId,
 })
 
 export const setChatConversationExpirationSuccess = (chatConversation) => ({
-  type: SET_CHAT_CONVERSATION_EXPIRATION_REQUEST,
+  type: SET_CHAT_CONVERSATION_EXPIRATION_SUCCESS,
   chatConversation,
 })
 
 export const setChatConversationExpirationFail = (error) => ({
-  type: SET_CHAT_CONVERSATION_EXPIRATION_REQUEST,
+  type: SET_CHAT_CONVERSATION_EXPIRATION_FAIL,
   error,
 })
 
diff --git a/app/javascript/gabsocial/actions/chat_messages.js b/app/javascript/gabsocial/actions/chat_messages.js
index 3cb046ad..43e85700 100644
--- a/app/javascript/gabsocial/actions/chat_messages.js
+++ b/app/javascript/gabsocial/actions/chat_messages.js
@@ -113,12 +113,12 @@ const deleteChatMessageFail = (error) => ({
 export const purgeChatMessages = (chatConversationId) => (dispatch, getState) => {
   if (!me || !chatConversationId) return
 
-  dispatch(deleteChatMessagesRequest(chatConversationId))
+  dispatch(purgeChatMessagesRequest(chatConversationId))
 
   api(getState).delete(`/api/v1/chat_conversations/messages/${chatConversationId}/destroy_all`).then((response) => {
-  dispatch(deleteChatMessagesSuccess(response.data))
+  dispatch(purgeChatMessagesSuccess(chatConversationId))
   }).catch((error) => {
-    dispatch(deleteChatMessagesFail(error))
+    dispatch(purgeChatMessagesFail(error))
   })
 }
 
diff --git a/app/javascript/gabsocial/actions/compose.js b/app/javascript/gabsocial/actions/compose.js
index a0bf17b6..fa8d0ac2 100644
--- a/app/javascript/gabsocial/actions/compose.js
+++ b/app/javascript/gabsocial/actions/compose.js
@@ -21,9 +21,9 @@ import { openModal, closeModal } from './modal'
 import {
   MODAL_COMPOSE,
   EXPIRATION_OPTION_5_MINUTES,
-  EXPIRATION_OPTION_60_MINUTES,
+  EXPIRATION_OPTION_1_HOUR,
   EXPIRATION_OPTION_6_HOURS,
-  EXPIRATION_OPTION_24_HOURS,
+  EXPIRATION_OPTION_1_DAY,
   EXPIRATION_OPTION_3_DAYS,
   EXPIRATION_OPTION_7_DAYS,
 } from '../constants'
@@ -345,23 +345,7 @@ export const submitCompose = (groupId, replyToId = null, router, isStandalone, a
   let scheduled_at = getState().getIn(['compose', 'scheduled_at'], null)
   if (scheduled_at !== null) scheduled_at = moment.utc(scheduled_at).toDate()
 
-  let expires_at = getState().getIn(['compose', 'expires_at'], null)
-
-  if (expires_at) {
-    if (expires_at === EXPIRATION_OPTION_5_MINUTES) {
-      expires_at = moment.utc().add('5', 'minute').toDate()
-    } else if (expires_at === EXPIRATION_OPTION_60_MINUTES) {
-      expires_at = moment.utc().add('60', 'minute').toDate()
-    } else if (expires_at === EXPIRATION_OPTION_6_HOURS) {
-      expires_at = moment.utc().add('6', 'hour').toDate()
-    } else if (expires_at === EXPIRATION_OPTION_24_HOURS) {
-      expires_at = moment.utc().add('24', 'hour').toDate()
-    } else if (expires_at === EXPIRATION_OPTION_3_DAYS) {
-      expires_at = moment.utc().add('3', 'day').toDate()
-    } else if (expires_at === EXPIRATION_OPTION_7_DAYS) {
-      expires_at = moment.utc().add('7', 'day').toDate()
-    }
-  }
+  const expires_at = getState().getIn(['compose', 'expires_at'], null)
 
   if (isMobile(window.innerWidth) && router && isStandalone) {
     router.history.goBack()
diff --git a/app/javascript/gabsocial/components/popover/chat_conversation_expiration_options_popover.js b/app/javascript/gabsocial/components/popover/chat_conversation_expiration_options_popover.js
index 1acccaca..7ed1409b 100644
--- a/app/javascript/gabsocial/components/popover/chat_conversation_expiration_options_popover.js
+++ b/app/javascript/gabsocial/components/popover/chat_conversation_expiration_options_popover.js
@@ -3,12 +3,12 @@ import PropTypes from 'prop-types'
 import { connect } from 'react-redux'
 import { defineMessages, injectIntl } from 'react-intl'
 import { closePopover } from '../../actions/popover'
-import { changeExpiresAt } from '../../actions/compose'
+import { setChatConversationExpiration } from '../../actions/chat_conversations'
 import {
   EXPIRATION_OPTION_5_MINUTES,
-  EXPIRATION_OPTION_60_MINUTES,
+  EXPIRATION_OPTION_1_HOUR,
   EXPIRATION_OPTION_6_HOURS,
-  EXPIRATION_OPTION_24_HOURS,
+  EXPIRATION_OPTION_1_DAY,
   EXPIRATION_OPTION_3_DAYS,
   EXPIRATION_OPTION_7_DAYS,
 } from '../../constants'
@@ -19,7 +19,7 @@ import Text from '../text'
 class ChatConversationExpirationOptionsPopover extends React.PureComponent {
 
   handleOnSetExpiration = (expiresAt) => {
-    this.props.onChangeExpiresAt(expiresAt)
+    this.props.onSetChatConversationExpiration(expiresAt)
     this.handleOnClosePopover()
   }
 
@@ -29,66 +29,62 @@ class ChatConversationExpirationOptionsPopover extends React.PureComponent {
 
   render() {
     const {
+      chatConversationId,
       expiresAtValue,
       intl,
       isXS,
     } = this.props
 
+    console.log("expiresAtValue:", expiresAtValue)
+    if (!chatConversationId) return <div/>
+
     const listItems = [
       {
         hideArrow: true,
         title: 'None',
-        onClick: () => this.handleOnSetStatusExpiration(null),
+        onClick: () => this.handleOnSetExpiration(null),
         isActive: !expiresAtValue,
       },
       {
         hideArrow: true,
         title: intl.formatMessage(messages.minutes, { number: 5 }),
-        onClick: () => this.handleOnSetStatusExpiration(EXPIRATION_OPTION_5_MINUTES),
+        onClick: () => this.handleOnSetExpiration(EXPIRATION_OPTION_5_MINUTES),
         isActive: expiresAtValue === EXPIRATION_OPTION_5_MINUTES,
       },
       {
         hideArrow: true,
         title: intl.formatMessage(messages.minutes, { number: 60 }),
-        onClick: () => this.handleOnSetStatusExpiration(EXPIRATION_OPTION_60_MINUTES),
-        isActive: expiresAtValue === EXPIRATION_OPTION_60_MINUTES,
+        onClick: () => this.handleOnSetExpiration(EXPIRATION_OPTION_1_HOUR),
+        isActive: expiresAtValue === EXPIRATION_OPTION_1_HOUR,
       },
       {
         hideArrow: true,
         title: '6 hours',
         title: intl.formatMessage(messages.hours, { number: 6 }),
-        onClick: () => this.handleOnSetStatusExpiration(EXPIRATION_OPTION_6_HOURS),
+        onClick: () => this.handleOnSetExpiration(EXPIRATION_OPTION_6_HOURS),
         isActive: expiresAtValue === EXPIRATION_OPTION_6_HOURS,
       },
       {
         hideArrow: true,
         title: intl.formatMessage(messages.hours, { number: 24 }),
-        onClick: () => this.handleOnSetStatusExpiration(EXPIRATION_OPTION_24_HOURS),
-        isActive: expiresAtValue === EXPIRATION_OPTION_24_HOURS,
+        onClick: () => this.handleOnSetExpiration(EXPIRATION_OPTION_1_DAY),
+        isActive: expiresAtValue === EXPIRATION_OPTION_1_DAY,
       },
       {
         hideArrow: true,
         title: '3 days',
         title: intl.formatMessage(messages.days, { number: 3 }),
-        onClick: () => this.handleOnSetStatusExpiration(EXPIRATION_OPTION_3_DAYS),
+        onClick: () => this.handleOnSetExpiration(EXPIRATION_OPTION_3_DAYS),
         isActive: expiresAtValue === EXPIRATION_OPTION_3_DAYS,
       },
       {
         hideArrow: true,
         title: intl.formatMessage(messages.days, { number: 7 }),
-        onClick: () => this.handleOnSetStatusExpiration(EXPIRATION_OPTION_7_DAYS),
+        onClick: () => this.handleOnSetExpiration(EXPIRATION_OPTION_7_DAYS),
         isActive: expiresAtValue === EXPIRATION_OPTION_7_DAYS,
       },
     ]
 
-    if (expiresAtValue) {
-      listItems.unshift({
-        hideArrow: true,
-        title: 'Remove expiration',
-        onClick: () => this.handleOnSetStatusExpiration(null),
-      },)
-    }
-
     return (
       <PopoverLayout
         width={210}
@@ -113,24 +109,24 @@ const messages = defineMessages({
   days: { id: 'intervals.full.days', defaultMessage: '{number, plural, one {# day} other {# days}}' },
 })
 
-const mapStateToProps = (state) => ({
-  expiresAtValue: state.getIn(['compose', 'expires_at']),
+const mapStateToProps = (state, { chatConversationId }) => ({
+  expiresAtValue: state.getIn(['chat_conversations', chatConversationId, 'chat_message_expiration_policy']),
 })
 
-const mapDispatchToProps = (dispatch) => ({
-  onChangeExpiresAt(expiresAt)  {
-    dispatch(changeExpiresAt(expiresAt))
-  },
+const mapDispatchToProps = (dispatch, { chatConversationId }) => ({
   onClosePopover() {
     dispatch(closePopover())
   },
+  onSetChatConversationExpiration(expiration) {
+    dispatch(setChatConversationExpiration(chatConversationId, expiration))
+  },
 })
 
 ChatConversationExpirationOptionsPopover.defaultProps = {
   expiresAtValue: PropTypes.string.isRequired,
   intl: PropTypes.object.isRequired,
   isXS: PropTypes.bool,
-  onChangeExpiresAt: PropTypes.func.isRequired,
+  onSetChatConversationExpiration: PropTypes.func.isRequired,
 }
 
 export default injectIntl(connect(mapStateToProps, mapDispatchToProps)(ChatConversationExpirationOptionsPopover))
\ No newline at end of file
diff --git a/app/javascript/gabsocial/components/popover/chat_conversation_options_popover.js b/app/javascript/gabsocial/components/popover/chat_conversation_options_popover.js
index df1429f4..4e1c1ddf 100644
--- a/app/javascript/gabsocial/components/popover/chat_conversation_options_popover.js
+++ b/app/javascript/gabsocial/components/popover/chat_conversation_options_popover.js
@@ -6,6 +6,10 @@ import { connect } from 'react-redux'
 import { closePopover } from '../../actions/popover'
 import { openModal } from '../../actions/modal'
 import { hideChatConversation } from '../../actions/chat_conversations'
+import {
+  muteChatConversation,
+  unmuteChatConversation,
+} from '../../actions/chat_conversation_accounts'
 import { purgeChatMessages } from '../../actions/chat_messages'
 import { MODAL_PRO_UPGRADE } from '../../constants'
 import { me } from '../../initial_state'
@@ -21,8 +25,12 @@ class ChatConversationOptionsPopover extends ImmutablePureComponent {
     this.handleOnClosePopover()
   }
 
-  handleOnUnmute = () => {
-    this.props.onUnute()
+  handleOnMute = () => {
+    if (this.props.isMuted) {
+      this.props.onUnmute()
+    } else {
+      this.props.onMute()
+    }
     this.handleOnClosePopover()
   }
 
@@ -30,7 +38,7 @@ class ChatConversationOptionsPopover extends ImmutablePureComponent {
     if (!this.props.isPro) {
       this.props.openProUpgradeModal()
     } else {
-      this.props.onPurge(this.props.chatConversationId)
+      this.props.onPurge()
     }
 
     this.handleOnClosePopover()
@@ -44,6 +52,7 @@ class ChatConversationOptionsPopover extends ImmutablePureComponent {
     const {
       intl,
       isXS,
+      isMuted,
     } = this.props
 
     const items = [
@@ -55,9 +64,9 @@ class ChatConversationOptionsPopover extends ImmutablePureComponent {
       },
       {
         hideArrow: true,
-        title: 'Mute Conversation',
-        subtitle: "Don't get notified of new messages",
-        onClick: () => this.handleOnHide(),
+        title: isMuted ? 'Unmute Conversation' : 'Mute Conversation',
+        subtitle: isMuted ? null : "Don't get notified of new messages",
+        onClick: () => this.handleOnMute(),
       },
       {},
       {
@@ -86,23 +95,28 @@ class ChatConversationOptionsPopover extends ImmutablePureComponent {
 
 const mapStateToProps = (state, { chatConversationId }) => ({
   isPro: state.getIn(['accounts', me, 'is_pro']),
-  chatConversation: makeGetChatConversation()(state, { id: chatConversationId }),
+  isMuted: state.getIn(['chat_conversations', chatConversationId, 'is_muted']),
 })
 
-const mapDispatchToProps = (dispatch) => ({
+const mapDispatchToProps = (dispatch, { chatConversationId }) => ({
   openProUpgradeModal() {
     dispatch(openModal(MODAL_PRO_UPGRADE))
   },
-  onSetCommentSortingSetting(type) {
-    dispatch(closePopover())
-  },
-  onPurge(chatConversationId) {
+  onPurge() {
     dispatch(purgeChatMessages(chatConversationId))
   },
-  onHide(chatConversationId) {
+  onHide() {
     dispatch(hideChatConversation(chatConversationId))
   },
-  onClosePopover: () => dispatch(closePopover()),
+  onMute() {
+    dispatch(muteChatConversation(chatConversationId))
+  },
+  onUnmute() {
+    dispatch(unmuteChatConversation(chatConversationId))
+  },
+  onClosePopover() {
+    dispatch(closePopover())
+  },
 })
 
 ChatConversationOptionsPopover.propTypes = {
diff --git a/app/javascript/gabsocial/components/popover/chat_message_options_popover.js b/app/javascript/gabsocial/components/popover/chat_message_options_popover.js
index 0b86521d..ebce126a 100644
--- a/app/javascript/gabsocial/components/popover/chat_message_options_popover.js
+++ b/app/javascript/gabsocial/components/popover/chat_message_options_popover.js
@@ -4,11 +4,11 @@ import { connect } from 'react-redux'
 import { closePopover } from '../../actions/popover'
 import { deleteChatMessage } from '../../actions/chat_messages'
 import {
+  fetchMessengerBlockingRelationships,
   blockChatMessenger,
   unblockChatMessenger,
-  reportChatMessage,
+  // reportChatMessage,
 } from '../../actions/chat_conversation_accounts'
-import { fetchRelationships } from '../../actions/accounts'
 import { makeGetChatMessage } from '../../selectors'
 import { me } from '../../initial_state'
 import PopoverLayout from './popover_layout'
@@ -20,7 +20,7 @@ class ChatMessageOptionsPopover extends React.PureComponent {
 
   componentDidMount() {
     if (!this.props.isMine) {
-      this.props.onFetchRelationships(this.props.fromAccountId)
+      this.props.onFetchMessengerBlockingRelationships(this.props.fromAccountId)
     }
   }
 
@@ -33,7 +33,7 @@ class ChatMessageOptionsPopover extends React.PureComponent {
   }
 
   handleOnBlock = () => {
-    if (this.props.isBlocked) {
+    if (this.props.isChatBlocked) {
       this.props.onUnblock(this.props.fromAccountId)
     } else {
       this.props.onBlock(this.props.fromAccountId)
@@ -48,7 +48,7 @@ class ChatMessageOptionsPopover extends React.PureComponent {
     const {
       isXS,
       isMine,
-      isBlocked,
+      isChatBlocked,
     } = this.props
 
     const items = isMine ? [
@@ -66,8 +66,8 @@ class ChatMessageOptionsPopover extends React.PureComponent {
       {},
       {
         hideArrow: true,
-        title: isBlocked ? 'Unblock Messenger' : 'Block Messenger',
-        subtitle: isBlocked ? '' : 'The messenger will not be able to message you.',
+        title: isChatBlocked ? 'Unblock Messenger' : 'Block Messenger',
+        subtitle: isChatBlocked ? null : 'The messenger will not be able to message you.',
         onClick: () => this.handleOnBlock(),
       },
     ]
@@ -90,7 +90,7 @@ const mapStateToProps = (state, { chatMessageId }) => {
   return {
     fromAccountId,
     isMine: fromAccountId === me,
-    isBlocked: state.getIn(['relationships', fromAccountId, 'chat_blocked_by'], false),
+    isChatBlocked: state.getIn(['relationships', fromAccountId, 'chat_blocking'], false),
   }
 }
 
@@ -101,15 +101,19 @@ const mapDispatchToProps = (dispatch) => ({
   },
   onBlock(accountId) {
     dispatch(blockChatMessenger(accountId))
+    dispatch(closePopover())
   },
   onUnblock(accountId) {
     dispatch(unblockChatMessenger(accountId))
+    dispatch(closePopover())
   },
   onReportChatMessage(chatMessageId) {
-    dispatch(reportChatMessage(chatMessageId))
+    // : todo :
+    // dispatch(reportChatMessage(chatMessageId))
+    dispatch(closePopover())
   },
-  onFetchRelationships(accountId) {
-    // dispatch(fetchRelationships(accountId))
+  onFetchMessengerBlockingRelationships(accountId) {
+    dispatch(fetchMessengerBlockingRelationships(accountId))
   },
   onClosePopover() {
     dispatch(closePopover())
@@ -120,8 +124,9 @@ ChatMessageOptionsPopover.propTypes = {
   isXS: PropTypes.bool,
   isMine: PropTypes.bool,
   chatMessageId: PropTypes.string.isRequired,
-  isBlocked: PropTypes.bool.isRequired,
+  isChatBlocked: PropTypes.bool.isRequired,
   onDeleteChatMessage: PropTypes.func.isRequired,
+  onIsChatMessengerBlocked: PropTypes.func.isRequired,
 }
 
 export default connect(mapStateToProps, mapDispatchToProps)(ChatMessageOptionsPopover)
\ No newline at end of file
diff --git a/app/javascript/gabsocial/components/popover/status_expiration_options_popover.js b/app/javascript/gabsocial/components/popover/status_expiration_options_popover.js
index 61108332..45b5c472 100644
--- a/app/javascript/gabsocial/components/popover/status_expiration_options_popover.js
+++ b/app/javascript/gabsocial/components/popover/status_expiration_options_popover.js
@@ -6,9 +6,9 @@ import { closePopover } from '../../actions/popover'
 import { changeExpiresAt } from '../../actions/compose'
 import {
   EXPIRATION_OPTION_5_MINUTES,
-  EXPIRATION_OPTION_60_MINUTES,
+  EXPIRATION_OPTION_1_HOUR,
   EXPIRATION_OPTION_6_HOURS,
-  EXPIRATION_OPTION_24_HOURS,
+  EXPIRATION_OPTION_1_DAY,
   EXPIRATION_OPTION_3_DAYS,
   EXPIRATION_OPTION_7_DAYS,
 } from '../../constants'
@@ -50,8 +50,8 @@ class StatusExpirationOptionsPopover extends React.PureComponent {
       {
         hideArrow: true,
         title: intl.formatMessage(messages.minutes, { number: 60 }),
-        onClick: () => this.handleOnSetStatusExpiration(EXPIRATION_OPTION_60_MINUTES),
-        isActive: expiresAtValue === EXPIRATION_OPTION_60_MINUTES,
+        onClick: () => this.handleOnSetStatusExpiration(EXPIRATION_OPTION_1_HOUR),
+        isActive: expiresAtValue === EXPIRATION_OPTION_1_HOUR,
       },
       {
         hideArrow: true,
@@ -63,8 +63,8 @@ class StatusExpirationOptionsPopover extends React.PureComponent {
       {
         hideArrow: true,
         title: intl.formatMessage(messages.hours, { number: 24 }),
-        onClick: () => this.handleOnSetStatusExpiration(EXPIRATION_OPTION_24_HOURS),
-        isActive: expiresAtValue === EXPIRATION_OPTION_24_HOURS,
+        onClick: () => this.handleOnSetStatusExpiration(EXPIRATION_OPTION_1_DAY),
+        isActive: expiresAtValue === EXPIRATION_OPTION_1_DAY,
       },
       {
         hideArrow: true,
diff --git a/app/javascript/gabsocial/components/status_card.js b/app/javascript/gabsocial/components/status_card.js
index a721d1f8..3fa1e73e 100644
--- a/app/javascript/gabsocial/components/status_card.js
+++ b/app/javascript/gabsocial/components/status_card.js
@@ -3,7 +3,6 @@ import PropTypes from 'prop-types'
 import Immutable from 'immutable'
 import ImmutablePropTypes from 'react-immutable-proptypes'
 import ImmutablePureComponent from 'react-immutable-pure-component'
-import punycode from 'punycode'
 import {
   CX,
   DEFAULT_REL,
diff --git a/app/javascript/gabsocial/constants.js b/app/javascript/gabsocial/constants.js
index bfcb0f45..52cbcf49 100644
--- a/app/javascript/gabsocial/constants.js
+++ b/app/javascript/gabsocial/constants.js
@@ -134,9 +134,9 @@ export const GAB_COM_INTRODUCE_YOURSELF_GROUP_ID = '12'
 export const MIN_ACCOUNT_CREATED_AT_ONBOARDING = 1594789200000 // 2020-07-15
 
 export const EXPIRATION_OPTION_5_MINUTES = 'five_minutes'
-export const EXPIRATION_OPTION_60_MINUTES = 'one_hour'
+export const EXPIRATION_OPTION_1_HOUR = 'one_hour'
 export const EXPIRATION_OPTION_6_HOURS = 'six_hours'
-export const EXPIRATION_OPTION_24_HOURS = 'one_day'
+export const EXPIRATION_OPTION_1_DAY = 'one_day'
 export const EXPIRATION_OPTION_3_DAYS = 'three_days'
 export const EXPIRATION_OPTION_7_DAYS = 'one_week'
 
diff --git a/app/javascript/gabsocial/features/messages/components/chat_conversations_list_item.js b/app/javascript/gabsocial/features/messages/components/chat_conversations_list_item.js
index bbda7730..29924cbb 100644
--- a/app/javascript/gabsocial/features/messages/components/chat_conversations_list_item.js
+++ b/app/javascript/gabsocial/features/messages/components/chat_conversations_list_item.js
@@ -7,6 +7,7 @@ import { makeGetChatConversation } from '../../../selectors'
 import { setChatConversationSelected } from '../../../actions/chats'
 import { CX } from '../../../constants'
 import Input from '../../../components/input'
+import Icon from '../../../components/icon'
 import DisplayNameGroup from '../../../components/display_name_group'
 import DisplayName from '../../../components/display_name'
 import AvatarGroup from '../../../components/avatar_group'
@@ -35,8 +36,6 @@ class ChatConversationsListItem extends ImmutablePureComponent {
 
     if (!chatConversation) return <div/>
 
-    console.log("chatConversation:", chatConversation)
-
     const containerClasses = CX({
       d: 1,
       w100PC: 1,
@@ -66,6 +65,8 @@ class ChatConversationsListItem extends ImmutablePureComponent {
     lastMessageText = lastMessageText.length >= 28 ? `${lastMessageText.substring(0, 28).trim()}...` : lastMessageText
     const content = { __html: lastMessageText }
     const date = !!lastMessage ? lastMessage.get('created_at') : chatConversation.get('created_at')
+    const isUnread = chatConversation.get('is_unread')
+    const isMuted = chatConversation.get('is_muted')
 
     return (
       <button
@@ -73,7 +74,13 @@ class ChatConversationsListItem extends ImmutablePureComponent {
         onClick={this.handleOnClick}
       >
         
-        { chatConversation.get('is_unread') && <div className={[_s.d, _s.posAbs, _s.left0, _s.top50PC, _s.ml10, _s.mtNeg5PX, _s.circle, _s.w10PX, _s.h10PX, _s.bgBrand].join(' ')} /> }
+        { isUnread && !isMuted && <div className={[_s.d, _s.posAbs, _s.left0, _s.top50PC, _s.ml10, _s.mtNeg5PX, _s.circle, _s.w10PX, _s.h10PX, _s.bgBrand].join(' ')} /> }
+        {
+          isMuted &&
+          <div className={[_s.d, _s.posAbs, _s.left0, _s.top50PC, _s.ml10, _s.mtNeg5PX, _s.circle, _s.w10PX, _s.h10PX, _s.bgTransparent].join(' ')}>
+            <Icon id='audio-mute' className={_s.cError} size='12px' /> 
+          </div>
+        }
         
         <div className={innerContainerClasses}>
           <AvatarGroup accounts={otherAccounts} size={avatarSize} noHover />
diff --git a/app/javascript/gabsocial/features/messages/components/chat_message_compose_form.js b/app/javascript/gabsocial/features/messages/components/chat_message_compose_form.js
index 59bec7ab..a98308a2 100644
--- a/app/javascript/gabsocial/features/messages/components/chat_message_compose_form.js
+++ b/app/javascript/gabsocial/features/messages/components/chat_message_compose_form.js
@@ -88,7 +88,11 @@ class ChatMessagesComposeForm extends React.PureComponent {
   }
 
   render () {
-    const { isXS, chatConversationId } = this.props
+    const {
+      isXS,
+      expiresAtValue,
+      chatConversationId,
+    } = this.props
     const { value } = this.state
     const disabled = false
 
@@ -108,6 +112,22 @@ class ChatMessagesComposeForm extends React.PureComponent {
       py10: 1,
     })
 
+    const expireBtnClasses = CX({
+      d: 1,
+      borderRight1PX: 1,
+      borderColorSecondary: 1,
+      w40PX: 1,
+      h100PC: 1,
+      aiCenter: 1,
+      jcCenter: 1,
+      cursorPointer: 1,
+      outlineNone: 1,
+      bgSubtle: !expiresAtValue,
+      bgBlack: !!expiresAtValue,
+    })
+
+    const expireBtnIconClassName = !!expiresAtValue ?  _s.cWhite : _s.cBlack
+
     const textarea = (
       <Textarea
         id='chat-message-compose-input'
@@ -137,13 +157,15 @@ class ChatMessagesComposeForm extends React.PureComponent {
     )
 
     const expiresBtn = (
-      <button
-        ref={this.setExpiresBtn}
-        className={[_s.d, _s.bgSubtle, _s.borderRight1PX, _s.borderColorSecondary, _s.w40PX, _s.h100PC, _s.aiCenter, _s.jcCenter, _s.cursorPointer, _s.outlineNone].join(' ')}
+      <Button
+        noClasses
+        buttonRef={this.setExpiresBtn}
+        className={expireBtnClasses}
         onClick={this.handleOnExpire}
-      >
-        <Icon id='stopwatch' className={[_s.cPrimary, _s.ml2].join(' ')} size='15px' />
-      </button>
+        icon='stopwatch'
+        iconSize='15px'
+        iconClassName={expireBtnIconClassName}
+      />
     )
 
     if (isXS) {
@@ -191,8 +213,9 @@ class ChatMessagesComposeForm extends React.PureComponent {
 
 }
 
-const mapStateToProps = (state) => ({
+const mapStateToProps = (state, { chatConversationId }) => ({
   isPro: state.getIn(['accounts', me, 'is_pro']),
+  expiresAtValue: state.getIn(['chat_conversations', chatConversationId, 'chat_message_expiration_policy']),
 })
 
 const mapDispatchToProps = (dispatch, { chatConversationId }) => ({
diff --git a/app/javascript/gabsocial/features/messages/components/chat_message_item.js b/app/javascript/gabsocial/features/messages/components/chat_message_item.js
index 2f4b4665..384d5524 100644
--- a/app/javascript/gabsocial/features/messages/components/chat_message_item.js
+++ b/app/javascript/gabsocial/features/messages/components/chat_message_item.js
@@ -12,9 +12,11 @@ import {
  } from '../../../constants'
 import { me } from '../../../initial_state'
 import Input from '../../../components/input'
+import Icon from '../../../components/icon'
 import Avatar from '../../../components/avatar'
 import Button from '../../../components/button'
 import Text from '../../../components/text'
+import DotTextSeperator from '../../../components/dot_text_seperator'
 import { makeGetChatMessage } from '../../../selectors'
 
 class ChatMessageItem extends ImmutablePureComponent {
@@ -30,9 +32,9 @@ class ChatMessageItem extends ImmutablePureComponent {
   }
 
   componentDidMount() {
-    const { lastChatMessageSameSender, lastChatMessageDate } = this.props
-    if (lastChatMessageDate) {
-      const createdAt = this.props.chatMessage.get('created_at')
+    const { lastChatMessageSameSender, lastChatMessageDate, chatMessage } = this.props
+    if (lastChatMessageDate && chatMessage) {
+      const createdAt = chatMessage.get('created_at')
       const isNewDay = moment(createdAt).format('L') !== moment(lastChatMessageDate).format('L')
       const isCloseToMyLast = moment(lastChatMessageDate).diff(createdAt, 'minutes') < 60 && lastChatMessageSameSender && !isNewDay
       this.setState({
@@ -125,6 +127,12 @@ class ChatMessageItem extends ImmutablePureComponent {
       displayNone: !isHovering,
     })
 
+    const expirationDate = chatMessage.get('expires_at')
+    let timeUntilExpiration
+    if (!!expirationDate) {
+      timeUntilExpiration = moment(expirationDate).fromNow()
+    }
+
     return (
       <div
         className={[_s.d, _s.w100PC, _s.pb10].join(' ')}
@@ -161,6 +169,15 @@ class ChatMessageItem extends ImmutablePureComponent {
           <div className={lowerContainerClasses}>
             <Text size='extraSmall' color='tertiary' align={alt ? 'right' : 'left'}>
               {moment(createdAt).format('lll')}
+
+              {
+                !!expirationDate &&
+                <React.Fragment>
+                  <DotTextSeperator />
+                  <Text size='extraSmall' color='tertiary' className={_s.ml5}>Expires in {timeUntilExpiration}</Text>
+                  <Icon id='stopwatch' size='11px' className={[_s.d, _s.ml5, _s.displayInline, _s.cSecondary].join(' ')} />
+                </React.Fragment>
+              }
             </Text>
           </div>
         </div>
diff --git a/app/javascript/gabsocial/features/messages/components/chat_message_scrolling_list.js b/app/javascript/gabsocial/features/messages/components/chat_message_scrolling_list.js
index 8f179df1..3a1ba183 100644
--- a/app/javascript/gabsocial/features/messages/components/chat_message_scrolling_list.js
+++ b/app/javascript/gabsocial/features/messages/components/chat_message_scrolling_list.js
@@ -47,15 +47,11 @@ class ChatMessageScrollingList extends ImmutablePureComponent {
     this.detachIntersectionObserver()
   }
 
-  componentWillReceiveProps (nextProps) {
-    const { chatConversationId } = nextProps
-
-    if (chatConversationId !== this.props.chatConversationId) {
-      this.props.onExpandChatMessages(chatConversationId)
-    }
-  }
-
   componentDidUpdate(prevProps, prevState, snapshot) {
+    if (prevProps.chatConversationId !== this.props.chatConversationId) {
+      this.props.onExpandChatMessages(this.props.chatConversationId)
+    }
+    
     // Reset the scroll position when a new child comes in in order not to
     // jerk the scrollbar around if you're already scrolled down the page.
     if (snapshot !== null && this.scrollContainerRef) {
@@ -69,6 +65,8 @@ class ChatMessageScrollingList extends ImmutablePureComponent {
     if (prevProps.chatMessageIds.size === 0 && this.props.chatMessageIds.size > 0 && this.scrollContainerRef) {
       this.scrollContainerRef.scrollTop = this.scrollContainerRef.scrollHeight
       this.props.onReadChatConversation(this.props.chatConversationId)
+    } else if (prevProps.chatMessageIds.size < this.props.chatMessageIds.size && this.scrollContainerRef) {
+      this.scrollContainerRef.scrollTop = this.scrollContainerRef.scrollHeight
     }
   }
 
@@ -265,7 +263,6 @@ class ChatMessageScrollingList extends ImmutablePureComponent {
               lastChatMessageId={lastChatMessageId}
               onMoveUp={this.handleMoveUp}
               onMoveDown={this.handleMoveDown}
-              commentsLimited
             />
           )
         }
diff --git a/app/javascript/gabsocial/features/messages/components/chat_settings_sidebar.js b/app/javascript/gabsocial/features/messages/components/chat_settings_sidebar.js
index d9452bdd..319c1160 100644
--- a/app/javascript/gabsocial/features/messages/components/chat_settings_sidebar.js
+++ b/app/javascript/gabsocial/features/messages/components/chat_settings_sidebar.js
@@ -27,9 +27,13 @@ class ChatSettingsSidebar extends React.PureComponent {
               to: '/messages/requests',
             },
             {
-              title: 'Blocked Chats',
+              title: 'Blocked Chat Messengers',
               to: '/messages/blocks',
             },
+            {
+              title: 'Muted Conversations',
+              to: '/messages/muted_conversations',
+            },
           ]}
         />
       </ResponsiveClassesComponent>
diff --git a/app/javascript/gabsocial/features/ui/ui.js b/app/javascript/gabsocial/features/ui/ui.js
index 9b04a59f..879c906c 100644
--- a/app/javascript/gabsocial/features/ui/ui.js
+++ b/app/javascript/gabsocial/features/ui/ui.js
@@ -221,6 +221,7 @@ class SwitchingArea extends React.PureComponent {
         <WrappedRoute path='/messages/settings' exact page={MessagesPage} component={MessagesSettings} content={children} componentParams={{ isSettings: true }} />
         <WrappedRoute path='/messages/requests' exact page={MessagesPage} component={ChatConversationRequests} content={children} componentParams={{ isSettings: true, source: 'requested' }} />
         <WrappedRoute path='/messages/blocks' exact page={MessagesPage} component={ChatConversationBlockedAccounts} content={children} componentParams={{ isSettings: true }} />
+        <WrappedRoute path='/messages/muted_conversations' exact page={MessagesPage} component={ChatConversationBlockedAccounts} content={children} componentParams={{ isSettings: true }} />
         <WrappedRoute path='/messages/:chatConversationId' exact page={MessagesPage} component={Messages} content={children} componentParams={{ source: 'approved' }} />
 
         <WrappedRoute path='/timeline/all' exact page={CommunityPage} component={CommunityTimeline} content={children} componentParams={{ title: 'Community Feed' }} />
diff --git a/app/javascript/gabsocial/reducers/chat_conversation_messages.js b/app/javascript/gabsocial/reducers/chat_conversation_messages.js
index 166150d2..ea2ade1a 100644
--- a/app/javascript/gabsocial/reducers/chat_conversation_messages.js
+++ b/app/javascript/gabsocial/reducers/chat_conversation_messages.js
@@ -7,6 +7,7 @@ import compareId from '../utils/compare_id'
 import {
   CHAT_MESSAGES_SEND_SUCCESS,
   CHAT_MESSAGES_DELETE_REQUEST,
+  CHAT_MESSAGES_PURGE_SUCCESS,
 } from '../actions/chat_messages'
 import {
   CHAT_CONVERSATION_MESSAGES_EXPAND_REQUEST,
@@ -101,6 +102,9 @@ export default function chat_conversation_messages(state = initialState, action)
   case CHAT_MESSAGES_DELETE_REQUEST:
     // : todo : 
     return state
+  case CHAT_MESSAGES_PURGE_SUCCESS:
+    // : todo :
+    return state
   default:
     return state
   }
diff --git a/app/javascript/gabsocial/reducers/chat_conversations.js b/app/javascript/gabsocial/reducers/chat_conversations.js
index 83f5e6c7..a2e1b5bf 100644
--- a/app/javascript/gabsocial/reducers/chat_conversations.js
+++ b/app/javascript/gabsocial/reducers/chat_conversations.js
@@ -16,6 +16,7 @@ import {
   CHAT_CONVERSATIONS_REQUESTED_EXPAND_SUCCESS,
   CHAT_CONVERSATION_REQUEST_APPROVE_SUCCESS,
   CHAT_CONVERSATION_MARK_READ_SUCCESS,
+  SET_CHAT_CONVERSATION_EXPIRATION_SUCCESS,
 } from '../actions/chat_conversations'
 
 const initialState = ImmutableMap()
@@ -41,6 +42,7 @@ const importChatConversations = (state, chatConversations) => {
 export default function chat_conversations(state = initialState, action) {
   switch(action.type) {
   case CHAT_CONVERSATION_REQUEST_APPROVE_SUCCESS:
+  case SET_CHAT_CONVERSATION_EXPIRATION_SUCCESS:
     return importChatConversation(state, action.chatConversation)
   case CHAT_CONVERSATIONS_APPROVED_FETCH_SUCCESS:
   case CHAT_CONVERSATIONS_APPROVED_EXPAND_SUCCESS:
diff --git a/app/javascript/gabsocial/reducers/relationships.js b/app/javascript/gabsocial/reducers/relationships.js
index 6e804054..96dee98d 100644
--- a/app/javascript/gabsocial/reducers/relationships.js
+++ b/app/javascript/gabsocial/reducers/relationships.js
@@ -12,6 +12,7 @@ import {
   RELATIONSHIPS_FETCH_SUCCESS,
 } from '../actions/accounts'
 import {
+  FETCH_CHAT_MESSENGER_BLOCKING_RELATIONSHIPS_SUCCESS,
   BLOCK_CHAT_MESSAGER_SUCCESS,
   UNBLOCK_CHAT_MESSAGER_SUCCESS,
 } from '../actions/chat_conversation_accounts'
@@ -39,14 +40,21 @@ export default function relationships(state = initialState, action) {
     return state.setIn([action.id, 'following'], false)
   case ACCOUNT_UNFOLLOW_FAIL:
     return state.setIn([action.id, 'following'], true)
+
+  case BLOCK_CHAT_MESSAGER_SUCCESS:
+  case FETCH_CHAT_MESSENGER_BLOCKING_RELATIONSHIPS_SUCCESS:
+  case UNBLOCK_CHAT_MESSAGER_SUCCESS:
+    return state.withMutations((map) => {
+      if (action.data.chat_blocking !== undefined) map.setIn([data.target_id, 'chat_blocking'], action.data.chat_blocking)
+      if (action.data.chat_blocked_by !== undefined) map.setIn([data.target_id, 'chat_blocked_by'], action.data.chat_blocked_by)
+    })
+
   case ACCOUNT_FOLLOW_SUCCESS:
   case ACCOUNT_UNFOLLOW_SUCCESS:
   case ACCOUNT_BLOCK_SUCCESS:
   case ACCOUNT_UNBLOCK_SUCCESS:
   case ACCOUNT_MUTE_SUCCESS:
   case ACCOUNT_UNMUTE_SUCCESS:
-  case BLOCK_CHAT_MESSAGER_SUCCESS:
-  case UNBLOCK_CHAT_MESSAGER_SUCCESS:
     return normalizeRelationship(state, action.relationship)
   case RELATIONSHIPS_FETCH_SUCCESS:
     return normalizeRelationships(state, action.relationships)
diff --git a/app/javascript/gabsocial/utils/urls.js b/app/javascript/gabsocial/utils/urls.js
index a7c470f1..28ac06fa 100644
--- a/app/javascript/gabsocial/utils/urls.js
+++ b/app/javascript/gabsocial/utils/urls.js
@@ -1,3 +1,4 @@
+import punycode from 'punycode'
 const IDNA_PREFIX = 'xn--'
 
 export const decodeIDNA = (domain) => {
diff --git a/app/models/chat_conversation_account.rb b/app/models/chat_conversation_account.rb
index ddf9991e..63d0cae9 100644
--- a/app/models/chat_conversation_account.rb
+++ b/app/models/chat_conversation_account.rb
@@ -27,7 +27,7 @@ class ChatConversationAccount < ApplicationRecord
   EXPIRATION_POLICY_MAP = {
     none: nil,
     five_minutes: '1',
-    sixty_minutes: '2',
+    one_hour: '2',
     six_hours: '3',
     one_day: '4',
     three_days: '5',
diff --git a/app/models/chat_message.rb b/app/models/chat_message.rb
index 269cf800..e159131f 100644
--- a/app/models/chat_message.rb
+++ b/app/models/chat_message.rb
@@ -23,6 +23,7 @@ class ChatMessage < ApplicationRecord
   
   default_scope { recent }
 
+  scope :expired, -> { where.not(expires_at: nil).where('expires_at < ?', Time.now.utc) }
   scope :recent, -> { reorder(created_at: :desc) }
 
   def emojis
diff --git a/app/models/concerns/account_interactions.rb b/app/models/concerns/account_interactions.rb
index 9250648c..38c53a82 100644
--- a/app/models/concerns/account_interactions.rb
+++ b/app/models/concerns/account_interactions.rb
@@ -24,6 +24,14 @@ module AccountInteractions
       follow_mapping(Block.where(account_id: target_account_ids, target_account_id: account_id), :account_id)
     end
 
+    def chat_blocking_map(target_account_ids, account_id)
+      follow_mapping(ChatBlock.where(target_account_id: target_account_ids, account_id: account_id), :target_account_id)
+    end
+
+    def chat_blocked_by_map(target_account_ids, account_id)
+      follow_mapping(ChatBlock.where(account_id: target_account_ids, target_account_id: account_id), :account_id)
+    end
+
     def muting_map(target_account_ids, account_id)
       Mute.where(target_account_id: target_account_ids, account_id: account_id).each_with_object({}) do |mute, mapping|
         mapping[mute.target_account_id] = {
@@ -97,6 +105,10 @@ module AccountInteractions
                        .find_or_create_by!(target_account: other_account)
   end
 
+  def chat_block!(other_account)
+    chat_block_relationships.find_or_create_by!(target_account: other_account)
+  end
+
   def mute!(other_account, notifications: nil)
     notifications = true if notifications.nil?
     mute = mute_relationships.create_with(hide_notifications: notifications).find_or_create_by!(target_account: other_account)
@@ -120,6 +132,11 @@ module AccountInteractions
     block&.destroy
   end
 
+  def chat_unblock!(other_account)
+    block = chat_block_relationships.find_by(target_account: other_account)
+    block&.destroy
+  end
+
   def unmute!(other_account)
     mute = mute_relationships.find_by(target_account: other_account)
     mute&.destroy
@@ -133,6 +150,14 @@ module AccountInteractions
     block_relationships.where(target_account: other_account).exists?
   end
 
+  def chat_blocking?(other_account)
+    chat_block_relationships.where(target_account: other_account).exists?
+  end
+
+  def chat_blocked_by(target_account_id, account_id)
+    ChatBlock.where(account_id: target_account_id, target_account_id: account_id).exists?
+  end
+
   def muting?(other_account)
     mute_relationships.where(target_account: other_account).exists?
   end
diff --git a/app/presenters/account_relationships_presenter.rb b/app/presenters/account_relationships_presenter.rb
index bdc26997..c714fc2c 100644
--- a/app/presenters/account_relationships_presenter.rb
+++ b/app/presenters/account_relationships_presenter.rb
@@ -12,6 +12,8 @@ class AccountRelationshipsPresenter
     @followed_by     = cached[:followed_by].merge(Account.followed_by_map(@uncached_account_ids, @current_account_id))
     @blocking        = cached[:blocking].merge(Account.blocking_map(@uncached_account_ids, @current_account_id))
     @blocked_by      = cached[:blocked_by].merge(Account.blocked_by_map(@uncached_account_ids, @current_account_id))
+    # @chat_blocking   = cached[:chat_blocking].merge(Account.chat_blocking_map(@uncached_account_ids, @current_account_id))
+    # @chat_blocked_by = cached[:chat_blocked_by].merge(Account.chat_blocked_by_map(@uncached_account_ids, @current_account_id))
     @muting          = cached[:muting].merge(Account.muting_map(@uncached_account_ids, @current_account_id))
     @requested       = cached[:requested].merge(Account.requested_map(@uncached_account_ids, @current_account_id))
 
@@ -21,15 +23,14 @@ class AccountRelationshipsPresenter
     @followed_by.merge!(options[:followed_by_map] || {})
     @blocking.merge!(options[:blocking_map] || {})
     @blocked_by.merge!(options[:blocked_by_map] || {})
+    # @chat_blocking.merge!(options[:chat_blocking_map] || {})
+    # @chat_blocked_by.merge!(options[:chat_blocked_by_map] || {})
     @muting.merge!(options[:muting_map] || {})
     @requested.merge!(options[:requested_map] || {})
   end
 
   private
 
-  # : todo :
-  # chat muting, chat blocking
-
   def cached
     return @cached if defined?(@cached)
 
@@ -38,6 +39,8 @@ class AccountRelationshipsPresenter
       followed_by: {},
       blocking: {},
       blocked_by: {},
+      # chat_blocking: {},
+      # chat_blocked_by: {},
       muting: {},
       requested: {},
     }
@@ -64,6 +67,8 @@ class AccountRelationshipsPresenter
         followed_by:     { account_id => followed_by[account_id] },
         blocking:        { account_id => blocking[account_id] },
         blocked_by:      { account_id => blocked_by[account_id] },
+        # chat_blocking:   { account_id => chat_blocking[account_id] },
+        # chat_blocked_by: { account_id => chat_blocked_by[account_id] },
         muting:          { account_id => muting[account_id] },
         requested:       { account_id => requested[account_id] },
       }
diff --git a/app/serializers/rest/chat_conversation_account_serializer.rb b/app/serializers/rest/chat_conversation_account_serializer.rb
index 307de39c..136a9c9f 100644
--- a/app/serializers/rest/chat_conversation_account_serializer.rb
+++ b/app/serializers/rest/chat_conversation_account_serializer.rb
@@ -24,4 +24,23 @@ class REST::ChatConversationAccountSerializer < ActiveModel::Serializer
     object.unread_count > 0
   end
 
+  def chat_message_expiration_policy
+    case object.chat_message_expiration_policy
+      when ChatConversationAccount::EXPIRATION_POLICY_MAP[:five_minutes]
+        return 'five_minutes'
+      when ChatConversationAccount::EXPIRATION_POLICY_MAP[:one_hour]
+        return 'one_hour'
+      when ChatConversationAccount::EXPIRATION_POLICY_MAP[:six_hours]
+        return 'six_hours'
+      when ChatConversationAccount::EXPIRATION_POLICY_MAP[:one_day]
+        return 'one_day'
+      when ChatConversationAccount::EXPIRATION_POLICY_MAP[:three_days]
+        return 'three_days'
+      when ChatConversationAccount::EXPIRATION_POLICY_MAP[:one_week]
+        return 'one_week'
+      else
+        return nil
+    end
+  end
+
 end
diff --git a/app/serializers/rest/chat_messenger_blocked_serializer.rb b/app/serializers/rest/chat_messenger_blocked_serializer.rb
new file mode 100644
index 00000000..7e0f2284
--- /dev/null
+++ b/app/serializers/rest/chat_messenger_blocked_serializer.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+class REST::ChatMessengerBlockedSerializer < ActiveModel::Serializer
+  attributes :target_id, :chat_blocking, :chat_blocked_by
+
+  def target_id
+    object.id.to_s
+  end
+
+  def chat_blocking
+    instance_options[:chat_blocking] || false
+  end
+
+  def chat_blocked_by
+    instance_options[:chat_blocked_by] || false
+  end
+
+end
diff --git a/app/services/delete_chat_message_service.rb b/app/services/delete_chat_message_service.rb
index 3b7f40f6..457b6cad 100644
--- a/app/services/delete_chat_message_service.rb
+++ b/app/services/delete_chat_message_service.rb
@@ -1,12 +1,23 @@
 # frozen_string_literal: true
 
 class DeleteChatMessageService < BaseService
-  def call(account, chatMessageId)    
-    @chat = ChatMessage.where(from_account: account).find(chatMessageId)
-    
-    # : todo :
-    # make sure last_chat_message_id in chat_account_conversation gets set to last
-    
-    @chat.destroy!
+  include Redisable
+
+  def call(chat_message)
+    return if chat_message.nil?
+
+    @chat_message = chat_message
+
+    RedisLock.acquire(lock_options) do |lock|
+      if lock.acquired?
+        @chat_message.destroy!
+      else
+        raise GabSocial::RaceConditionError
+      end
+    end
+  end
+
+  def lock_options
+    { redis: Redis.current, key: "distribute_chat_message:#{@chat_message.id}" }
   end
 end
diff --git a/app/services/post_chat_message_service.rb b/app/services/post_chat_message_service.rb
index 084b61a3..6f9b2481 100644
--- a/app/services/post_chat_message_service.rb
+++ b/app/services/post_chat_message_service.rb
@@ -49,14 +49,13 @@ class PostChatMessageService < BaseService
   end
 
   def postprocess_chat!
-    @chat_conversation_recipients_accounts = ChatConversationAccount.where(chat_conversation: @chat_conversation)
     @chat_conversation_recipients_accounts.each do |recipient|
       recipient.last_chat_message_id = @chat.id
-      recipient.is_hidden = false  # : todo : reset to show unless blocked
 
       # Get not mine
       if @account_conversation.id != recipient.id
         recipient.unread_count = recipient.unread_count + 1
+        recipient.is_hidden = false
 
         # check if muting
         unless recipient.is_muted
@@ -72,33 +71,46 @@ class PostChatMessageService < BaseService
   end
 
   def set_chat_conversation_recipients!
-    # : todo :
-    # check if chat blocked
-    # check if normal blocked
-    
     @account_conversation = ChatConversationAccount.where(account: @account, chat_conversation: @chat_conversation).first
+    @chat_conversation_recipients_accounts = ChatConversationAccount.where(chat_conversation: @chat_conversation)
+
+    # if 1-to-1 chat, check for blocking and dont allow message to send if blocking
+    # if 1-to-many let chat go through but keep is_hidden
+    @chat_conversation_recipients_accounts.each do |recipient|
+      # : todo :
+      # check if chat blocked
+      # check if normal blocked
+
+      if recipient.account.blocking?(@account) || recipient.account.chat_blocking?(@account)
+        raise GabSocial::NotPermittedError
+      end
+    end
+      
+      
   rescue ArgumentError
     raise ActiveRecord::RecordInvalid
   end
 
   def set_message_expiration_date!
     @expires_at = nil
+
+    unless @account.is_pro
+      return @expires_at
+    end
     
     case @account_conversation.chat_message_expiration_policy
-    when :five_minutes
-      @expires_at = 5.minutes
-    when :sixty_minutes
-      @expires_at = 1.hour
-    when :six_hours
-      @expires_at = 6.hours
-    when :one_day
-      @expires_at = 1.day
-    when :three_days
-      @expires_at = 3.days
-    when :one_week
-      @expires_at = 1.week
-    else
-      @expires_at = nil
+      when ChatConversationAccount::EXPIRATION_POLICY_MAP[:five_minutes]
+        @expires_at = Time.now + 5.minutes
+      when ChatConversationAccount::EXPIRATION_POLICY_MAP[:one_hour]
+        @expires_at = Time.now + 1.hour
+      when ChatConversationAccount::EXPIRATION_POLICY_MAP[:six_hours]
+        @expires_at = Time.now + 6.hours
+      when ChatConversationAccount::EXPIRATION_POLICY_MAP[:one_day]
+        @expires_at = Time.now + 1.day
+      when ChatConversationAccount::EXPIRATION_POLICY_MAP[:three_days]
+        @expires_at = Time.now + 3.days
+      when ChatConversationAccount::EXPIRATION_POLICY_MAP[:one_week]
+        @expires_at = Time.now + 1.week
     end
     
     @expires_at 
diff --git a/app/services/post_status_service.rb b/app/services/post_status_service.rb
index 0f94aaa3..f399c183 100644
--- a/app/services/post_status_service.rb
+++ b/app/services/post_status_service.rb
@@ -59,7 +59,23 @@ class PostStatusService < BaseService
     @visibility   = @options[:visibility] || @account.user&.setting_default_privacy
     @visibility   = :unlisted if @visibility == :public && @account.silenced?
     @visibility   = :private_group if @isPrivateGroup
-    @expires_at   = @options[:expires_at]&.to_datetime if @account.is_pro
+    @expires_at = nil
+    if @account.is_pro
+      case @options[:expires_at]
+        when 'five_minutes'
+          @expires_at = Time.now + 5.minutes
+        when 'one_hour'
+          @expires_at = Time.now + 1.hour
+        when 'six_hours'
+          @expires_at = Time.now + 6.hours
+        when 'one_day'
+          @expires_at = Time.now + 1.day
+        when 'three_days'
+          @expires_at = Time.now + 3.days
+        when 'one_week'
+          @expires_at = Time.now + 1.week
+      end
+    end
     @scheduled_at = @options[:scheduled_at]&.to_datetime
     @scheduled_at = nil if scheduled_in_the_past?
   rescue ArgumentError
diff --git a/app/workers/delete_chat_message_worker.rb b/app/workers/delete_chat_message_worker.rb
new file mode 100644
index 00000000..2f78d5a3
--- /dev/null
+++ b/app/workers/delete_chat_message_worker.rb
@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+class DeleteChatMessageWorker
+  include Sidekiq::Worker
+
+  sidekiq_options unique: :until_executed
+
+  def perform(chat_message_id)
+    return if chat_message_id.nil?
+    DeleteChatMessageService.new.call(ChatMessage.find(chat_message_id))
+  end
+end
diff --git a/app/workers/scheduler/expiring_chat_messages_scheduler.rb b/app/workers/scheduler/expiring_chat_messages_scheduler.rb
new file mode 100644
index 00000000..5e334d37
--- /dev/null
+++ b/app/workers/scheduler/expiring_chat_messages_scheduler.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class Scheduler::ExpiringChatMessagesScheduler
+  include Sidekiq::Worker
+  
+  def perform
+    expired_chat_messages.find_each do |chat_message|
+      DeleteChatMessageWorker.perform_async(chat_message.id)
+    end
+  end
+
+  private
+
+  def expired_chat_messages
+    ChatMessage.unscoped.expired
+  end
+end
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index d2a07d56..d2612157 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -226,17 +226,17 @@ Rails.application.routes.draw do
         resource :explore, only: :show, controller: :explore
       end
 
-      resource :chat_conversation_accounts, only: :show do
+      namespace :chat_conversation_accounts do
         resource :blocked_chat_accounts, only: :show, controller: 'chat_conversation_accounts/blocked_chat_accounts'
-
+      end
+      
+      resources :chat_conversation_accounts, only: :show do
         member do
-          get :is_messenger_blocked
-          get :is_messenger_muted
+          post :messenger_block_relationships
           post :block_messenger
           post :unblock_messenger
           post :mute_chat_conversation
           post :unmute_chat_conversation
-          post :set_expiration_policy
         end
       end
 
@@ -263,6 +263,7 @@ Rails.application.routes.draw do
           post :mark_chat_conversation_approved
           post :mark_chat_conversation_read
           post :mark_chat_conversation_hidden
+          post :set_expiration_policy
         end
       end
 
diff --git a/config/sidekiq.yml b/config/sidekiq.yml
index 108e1262..d3e0e7f2 100644
--- a/config/sidekiq.yml
+++ b/config/sidekiq.yml
@@ -18,6 +18,9 @@
   scheduled_statuses_scheduler:
     every: '1m'
     class: Scheduler::ScheduledStatusesScheduler
+  expiring_chat_messages_scheduler:
+    every: '1m'
+    class: Scheduler::ExpiringChatMessagesScheduler
   media_cleanup_scheduler:
     cron: '<%= Random.rand(0..59) %> <%= Random.rand(3..5) %> * * *'
     class: Scheduler::MediaCleanupScheduler