diff --git a/app/containers/MessageBox/LeftButtons.android.tsx b/app/containers/MessageBox/LeftButtons.android.tsx
index 105ce6297..bafbe2a68 100644
--- a/app/containers/MessageBox/LeftButtons.android.tsx
+++ b/app/containers/MessageBox/LeftButtons.android.tsx
@@ -3,7 +3,6 @@ import React from 'react';
 import { CancelEditingButton, ToggleEmojiButton } from './buttons';
 
 interface IMessageBoxLeftButtons {
-	theme: string;
 	showEmojiKeyboard: boolean;
 	openEmoji(): void;
 	closeEmoji(): void;
@@ -11,13 +10,11 @@ interface IMessageBoxLeftButtons {
 	editCancel(): void;
 }
 
-const LeftButtons = React.memo(
-	({ theme, showEmojiKeyboard, editing, editCancel, openEmoji, closeEmoji }: IMessageBoxLeftButtons) => {
-		if (editing) {
-			return <CancelEditingButton onPress={editCancel} theme={theme} />;
-		}
-		return <ToggleEmojiButton show={showEmojiKeyboard} open={openEmoji} close={closeEmoji} theme={theme} />;
+const LeftButtons = ({ showEmojiKeyboard, editing, editCancel, openEmoji, closeEmoji }: IMessageBoxLeftButtons) => {
+	if (editing) {
+		return <CancelEditingButton onPress={editCancel} />;
 	}
-);
+	return <ToggleEmojiButton show={showEmojiKeyboard} open={openEmoji} close={closeEmoji} />;
+};
 
 export default LeftButtons;
diff --git a/app/containers/MessageBox/LeftButtons.ios.tsx b/app/containers/MessageBox/LeftButtons.ios.tsx
index 3ed9b5060..a380de171 100644
--- a/app/containers/MessageBox/LeftButtons.ios.tsx
+++ b/app/containers/MessageBox/LeftButtons.ios.tsx
@@ -5,23 +5,20 @@ import { ActionsButton, CancelEditingButton } from './buttons';
 import styles from './styles';
 
 interface IMessageBoxLeftButtons {
-	theme: string;
 	showMessageBoxActions(): void;
 	editing: boolean;
 	editCancel(): void;
 	isActionsEnabled: boolean;
 }
 
-const LeftButtons = React.memo(
-	({ theme, showMessageBoxActions, editing, editCancel, isActionsEnabled }: IMessageBoxLeftButtons) => {
-		if (editing) {
-			return <CancelEditingButton onPress={editCancel} theme={theme} />;
-		}
-		if (isActionsEnabled) {
-			return <ActionsButton onPress={showMessageBoxActions} theme={theme} />;
-		}
-		return <View style={styles.buttonsWhitespace} />;
+const LeftButtons = ({ showMessageBoxActions, editing, editCancel, isActionsEnabled }: IMessageBoxLeftButtons) => {
+	if (editing) {
+		return <CancelEditingButton onPress={editCancel} />;
 	}
-);
+	if (isActionsEnabled) {
+		return <ActionsButton onPress={showMessageBoxActions} />;
+	}
+	return <View style={styles.buttonsWhitespace} />;
+};
 
 export default LeftButtons;
diff --git a/app/containers/MessageBox/RightButtons.android.tsx b/app/containers/MessageBox/RightButtons.android.tsx
index 0ad3b22ee..40eef514f 100644
--- a/app/containers/MessageBox/RightButtons.android.tsx
+++ b/app/containers/MessageBox/RightButtons.android.tsx
@@ -12,17 +12,15 @@ interface IMessageBoxRightButtons {
 	isActionsEnabled: boolean;
 }
 
-const RightButtons = React.memo(
-	({ theme, showSend, submit, showMessageBoxActions, isActionsEnabled }: IMessageBoxRightButtons) => {
-		if (showSend) {
-			return <SendButton onPress={submit} theme={theme} />;
-		}
-		if (isActionsEnabled) {
-			return <ActionsButton onPress={showMessageBoxActions} theme={theme} />;
-		}
-
-		return <View style={styles.buttonsWhitespace} />;
+const RightButtons = ({ showSend, submit, showMessageBoxActions, isActionsEnabled }: IMessageBoxRightButtons) => {
+	if (showSend) {
+		return <SendButton onPress={submit} />;
 	}
-);
+	if (isActionsEnabled) {
+		return <ActionsButton onPress={showMessageBoxActions} />;
+	}
+
+	return <View style={styles.buttonsWhitespace} />;
+};
 
 export default RightButtons;
diff --git a/app/containers/MessageBox/buttons/SendButton.tsx b/app/containers/MessageBox/buttons/SendButton.tsx
index 7c3564dbf..ad8347ccd 100644
--- a/app/containers/MessageBox/buttons/SendButton.tsx
+++ b/app/containers/MessageBox/buttons/SendButton.tsx
@@ -5,7 +5,6 @@ import { useColors } from '@app/lib/hooks/useColors';
 import BaseButton from './BaseButton';
 
 interface ISendButton {
-	theme: string;
 	onPress(): void;
 }