diff --git a/src/components/ForwardForm/index.js b/src/components/ForwardForm/index.js
index 918c5a3f16..0a2f20c168 100644
--- a/src/components/ForwardForm/index.js
+++ b/src/components/ForwardForm/index.js
@@ -9,7 +9,7 @@ import Button from '../Button';
 import styles from './styles.scss';
 import i18n from './i18n';
 
-const cleanRegex = /[^\d+*-]/g;
+const cleanRegex = /[^\d+*-\s]/g;
 
 function ForwardNumbers({
   numbers,
diff --git a/src/components/ReplyWithMessage/index.js b/src/components/ReplyWithMessage/index.js
index dadbee95f4..f88c1a18ff 100644
--- a/src/components/ReplyWithMessage/index.js
+++ b/src/components/ReplyWithMessage/index.js
@@ -24,7 +24,7 @@ function TimeInput(props) {
     <div className={styles.timeInput}>
       <span className={styles.timeValue}>
         <input
-          maxLength={3}
+          maxLength={2}
           value={props.timeValue}
           onChange={props.onTimeValueChange}
           ref={props.inputRef}
@@ -249,6 +249,7 @@ export default class ReplyWithMessage extends Component {
               classnames(styles.replyButton, disableButton ? styles.disabled : null)
             }
             onClick={this.onReply}
+            disabled={disableButton}
           >
             <span className={styles.buttonText}>
               {i18n.getString('send', currentLocale)}