diff --git a/browser/main/modals/PreferencesModal/ConfigTab.styl b/browser/main/modals/PreferencesModal/ConfigTab.styl
index 23eef574..117bb541 100644
--- a/browser/main/modals/PreferencesModal/ConfigTab.styl
+++ b/browser/main/modals/PreferencesModal/ConfigTab.styl
@@ -115,7 +115,6 @@
     line-height 1.2
 
 .note-for-keymap
-  margin-left: 10px
   font-size: 12px
 
 .code-mirror
diff --git a/browser/main/modals/PreferencesModal/InfoTab.js b/browser/main/modals/PreferencesModal/InfoTab.js
index 9fbea110..8503cdae 100644
--- a/browser/main/modals/PreferencesModal/InfoTab.js
+++ b/browser/main/modals/PreferencesModal/InfoTab.js
@@ -4,6 +4,7 @@ import styles from './InfoTab.styl'
 import ConfigManager from 'browser/main/lib/ConfigManager'
 import store from 'browser/main/store'
 import AwsMobileAnalyticsConfig from 'browser/main/lib/AwsMobileAnalyticsConfig'
+import _ from 'lodash'
 
 const electron = require('electron')
 const { shell, remote } = electron
@@ -36,8 +37,21 @@ class InfoTab extends React.Component {
 
     if (!newConfig.amaEnabled) {
       AwsMobileAnalyticsConfig.recordDynamicCustomEvent('DISABLE_AMA')
+      this.setState({
+        amaMessage: 'We hope we will gain your trust'
+      })
+    } else {
+      this.setState({
+        amaMessage: 'Thank\'s for trust us'
+      })
     }
 
+    _.debounce(() => {
+      this.setState({
+        amaMessage: ''
+      })
+    }, 3000)()
+
     ConfigManager.set(newConfig)
 
     store.dispatch({
@@ -46,6 +60,11 @@ class InfoTab extends React.Component {
     })
   }
 
+  infoMessage () {
+    const { amaMessage } = this.state
+    return amaMessage ? <p styleName='policy-confirm'>{amaMessage}</p> : null
+  }
+
   render () {
     return (
       <div styleName='root'>
@@ -107,6 +126,7 @@ class InfoTab extends React.Component {
         />
         Enable to send analytics to our servers<br />
         <button styleName='policy-submit' onClick={(e) => this.handleSaveButtonClick(e)}>Save</button>
+        {this.infoMessage()}
       </div>
     )
   }
diff --git a/browser/main/modals/PreferencesModal/InfoTab.styl b/browser/main/modals/PreferencesModal/InfoTab.styl
index 176405f4..cefb3abc 100644
--- a/browser/main/modals/PreferencesModal/InfoTab.styl
+++ b/browser/main/modals/PreferencesModal/InfoTab.styl
@@ -50,6 +50,10 @@
 .policy-submit
   margin-top 10px
 
+.policy-confirm
+  margin-top 10px
+  font-size 12px
+
 body[data-theme="dark"]
   .root
     color alpha($tab--dark-text-color, 80%)
diff --git a/browser/main/modals/PreferencesModal/UiTab.js b/browser/main/modals/PreferencesModal/UiTab.js
index efcfffff..dc20c67a 100644
--- a/browser/main/modals/PreferencesModal/UiTab.js
+++ b/browser/main/modals/PreferencesModal/UiTab.js
@@ -228,7 +228,7 @@ class UiTab extends React.Component {
                 <option value='vim'>vim</option>
                 <option value='emacs'>emacs</option>
               </select>
-              <span styleName='note-for-keymap'>Please restart boostnote after you change the keymap</span>
+              <p styleName='note-for-keymap'>⚠️ Please restart boostnote after you change the keymap</p>
             </div>
           </div>