diff --git a/package.json b/package.json
index 0aac6167e..0595adf82 100644
--- a/package.json
+++ b/package.json
@@ -22,7 +22,6 @@
     "lambda": "yarn run lambda:build && yarn run lambda:serve",
     "prettify": "prettier --write 'src/**/*.{ts,tsx,json,js,css,md}'",
     "netlify": "yarn run build && yarn run lambda:build",
-    "precommit": "lint-staged",
     "preversion": "yarn test --watchAll=false",
     "postversion": "git push --tags && git push origin main",
     "version": "yarn run build && auto-changelog -p && git add CHANGELOG.md",
@@ -158,5 +157,10 @@
     "typescript": "3.4.5",
     "uniqid": "5.0.3",
     "uuid": "3.3.2"
+  },
+  "husky": {
+    "hooks": {
+      "pre-commit": "lint-staged"
+    }
   }
 }
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/localization/__snapshots__/MsgLocalizationForm.test.ts.snap b/src/components/flow/actions/localization/__snapshots__/MsgLocalizationForm.test.ts.snap
index 238f6ae0b..943a0979d 100644
--- a/src/components/flow/actions/localization/__snapshots__/MsgLocalizationForm.test.ts.snap
+++ b/src/components/flow/actions/localization/__snapshots__/MsgLocalizationForm.test.ts.snap
@@ -120,6 +120,7 @@ exports[`MsgLocalizationForm inits inits with initial values 1`] = `
     </div>
   </div>
   <TextInputElement
+    __className="message"
     autocomplete={true}
     entry={
       Object {
@@ -256,6 +257,7 @@ exports[`MsgLocalizationForm render should render 1`] = `
     </div>
   </div>
   <TextInputElement
+    __className="message"
     autocomplete={true}
     entry={
       Object {
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}
diff --git a/src/components/flow/actions/saymsg/__snapshots__/SayMsgForm.test.ts.snap b/src/components/flow/actions/saymsg/__snapshots__/SayMsgForm.test.ts.snap
index 47c23565f..a137fc65b 100644
--- a/src/components/flow/actions/saymsg/__snapshots__/SayMsgForm.test.ts.snap
+++ b/src/components/flow/actions/saymsg/__snapshots__/SayMsgForm.test.ts.snap
@@ -38,6 +38,7 @@ exports[`SayMsgForm render should render 1`] = `
     onChange={[MockFunction]}
   />
   <TextInputElement
+    __className="message"
     autocomplete={true}
     entry={
       Object {