diff --git a/src/components/flow/actions/action/Action.module.scss b/src/components/flow/actions/action/Action.module.scss
index 46316cb9e..000d31f00 100644
--- a/src/components/flow/actions/action/Action.module.scss
+++ b/src/components/flow/actions/action/Action.module.scss
@@ -130,4 +130,8 @@
   background: rgba(255, 255, 255, 0.9);
   $color_1: rgba(0, 0, 0, 0.12);
   $color_2: rgba(0, 0, 0, 0.1);
+}
+
+.message {
+  --textarea-height: 8em;
 }
\ No newline at end of file
diff --git a/src/components/flow/actions/localization/MsgLocalizationForm.tsx b/src/components/flow/actions/localization/MsgLocalizationForm.tsx
index 03d8be2db..b4283f203 100644
--- a/src/components/flow/actions/localization/MsgLocalizationForm.tsx
+++ b/src/components/flow/actions/localization/MsgLocalizationForm.tsx
@@ -293,7 +293,7 @@ export default class MsgLocalizationForm extends React.Component<
       );
     }
 
-    if (this.state.template) {
+    if (this.state.template && this.state.templateVariables.length > 0) {
       tabs.push({
         name: 'WhatsApp',
         body: (
@@ -339,6 +339,7 @@ export default class MsgLocalizationForm extends React.Component<
 
         <TextInputElement
           name={i18n.t('forms.message', 'Message')}
+          __className={styles.message}
           showLabel={false}
           onChange={this.handleMessageUpdate}
           entry={this.state.message}
diff --git a/src/components/flow/actions/saymsg/SayMsgForm.tsx b/src/components/flow/actions/saymsg/SayMsgForm.tsx
index 06062dbee..30a86f1e4 100644
--- a/src/components/flow/actions/saymsg/SayMsgForm.tsx
+++ b/src/components/flow/actions/saymsg/SayMsgForm.tsx
@@ -1,4 +1,5 @@
 import { react as bindCallbacks } from 'auto-bind';
+import styles from 'components/flow/actions/action/Action.module.scss';
 import Dialog, { ButtonSet } from 'components/dialog/Dialog';
 import { ActionFormProps } from 'components/flow/props';
 import TextInputElement from 'components/form/textinput/TextInputElement';
@@ -82,6 +83,7 @@ export default class SayMsgForm extends React.Component<ActionFormProps, SayMsgF
       <Dialog title={typeConfig.name} headerClass={typeConfig.type} buttons={this.getButtons()}>
         <TypeList __className="" initialType={typeConfig} onChange={this.props.onTypeChange} />
         <TextInputElement
+          __className={styles.message}
           name={i18n.t('forms.message', 'Message')}
           showLabel={false}
           onChange={this.handleMessageUpdate}