diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/notes/activities/MainActivity.kt
index 661a3a9f..81fb2fad 100644
--- a/app/src/main/kotlin/com/simplemobiletools/notes/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/notes/activities/MainActivity.kt
@@ -223,11 +223,13 @@ class MainActivity : SimpleActivity(), ViewPager.OnPageChangeListener {
     }
 
     fun noteSavedSuccessfully() {
-        val message = String.format(getString(R.string.note_saved_successfully), mCurrentNote.title)
-        toast(message)
+        if (config.displaySuccess) {
+            val message = String.format(getString(R.string.note_saved_successfully), mCurrentNote.title)
+            toast(message)
+        }
     }
 
-    private fun getCurrentNoteText() = (view_pager.adapter as NotesPagerAdapter).getCurrentNoteText(view_pager.currentItem)
+    private fun getCurrentNoteText() = (view_pager.adapter as NotesPagerAdapter).getCurrentNoteViewText(view_pager.currentItem)
 
     private fun displayDeleteNotePrompt() {
         val message = String.format(getString(R.string.delete_note_prompt_message), mCurrentNote.title)
diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/activities/SettingsActivity.kt b/app/src/main/kotlin/com/simplemobiletools/notes/activities/SettingsActivity.kt
index 84b7ff91..84f622ec 100644
--- a/app/src/main/kotlin/com/simplemobiletools/notes/activities/SettingsActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/notes/activities/SettingsActivity.kt
@@ -22,6 +22,7 @@ class SettingsActivity : SimpleActivity() {
         super.onResume()
 
         setupCustomizeColors()
+        setupDisplaySuccess()
         setupClickableLinks()
         setupFontSize()
         setupWidgetNote()
@@ -35,6 +36,14 @@ class SettingsActivity : SimpleActivity() {
         }
     }
 
+    private fun setupDisplaySuccess() {
+        settings_display_success.isChecked = config.displaySuccess
+        settings_display_success_holder.setOnClickListener {
+            settings_display_success.toggle()
+            config.displaySuccess = settings_display_success.isChecked
+        }
+    }
+
     private fun setupClickableLinks() {
         settings_clickable_links.isChecked = config.clickableLinks
         settings_clickable_links_holder.setOnClickListener {
diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/adapters/NotesPagerAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/notes/adapters/NotesPagerAdapter.kt
index c73a4908..14f208bf 100644
--- a/app/src/main/kotlin/com/simplemobiletools/notes/adapters/NotesPagerAdapter.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/notes/adapters/NotesPagerAdapter.kt
@@ -30,7 +30,7 @@ class NotesPagerAdapter(fm: FragmentManager, private val notes: List<Note>) : Fr
 
     override fun getPageTitle(position: Int) = notes[position].title
 
-    fun getCurrentNoteText(position: Int) = fragments[position].getCurrentNoteViewText()
+    fun getCurrentNoteViewText(position: Int) = fragments[position].getCurrentNoteViewText()
 
     fun showKeyboard(position: Int) = fragments[position]?.showKeyboard()
 }
diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/helpers/Config.kt b/app/src/main/kotlin/com/simplemobiletools/notes/helpers/Config.kt
index 1e4c0080..cec3dd58 100644
--- a/app/src/main/kotlin/com/simplemobiletools/notes/helpers/Config.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/notes/helpers/Config.kt
@@ -8,6 +8,10 @@ class Config(context: Context) : BaseConfig(context) {
         fun newInstance(context: Context) = Config(context)
     }
 
+    var displaySuccess: Boolean
+        get() = prefs.getBoolean(DISPLAY_SUCCESS, true)
+        set(displaySuccess) = prefs.edit().putBoolean(DISPLAY_SUCCESS, displaySuccess).apply()
+
     var clickableLinks: Boolean
         get() = prefs.getBoolean(CLICKABLE_LINKS, false)
         set(clickableLinks) = prefs.edit().putBoolean(CLICKABLE_LINKS, clickableLinks).apply()
diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/helpers/Constants.kt b/app/src/main/kotlin/com/simplemobiletools/notes/helpers/Constants.kt
index 9a9a4c18..90f40e9d 100644
--- a/app/src/main/kotlin/com/simplemobiletools/notes/helpers/Constants.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/notes/helpers/Constants.kt
@@ -4,6 +4,7 @@ val NOTE_ID = "note_id"
 
 // shared preferences
 val CURRENT_NOTE_ID = "current_note_id"
+val DISPLAY_SUCCESS = "display_success"
 val CLICKABLE_LINKS = "clickable_links"
 val WIDGET_NOTE_ID = "widget_note_id"
 val FONT_SIZE = "font_size"
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index 94822105..703dbcec 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -30,6 +30,26 @@
 
         </RelativeLayout>
 
+        <RelativeLayout
+            android:id="@+id/settings_display_success_holder"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/medium_margin"
+            android:background="?attr/selectableItemBackground"
+            android:padding="@dimen/activity_margin">
+
+            <com.simplemobiletools.commons.views.MySwitchCompat
+                android:id="@+id/settings_display_success"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@null"
+                android:clickable="false"
+                android:paddingLeft="@dimen/medium_margin"
+                android:paddingStart="@dimen/medium_margin"
+                android:text="@string/display_success_message"/>
+
+        </RelativeLayout>
+
         <RelativeLayout
             android:id="@+id/settings_clickable_links_holder"
             android:layout_width="match_parent"
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 356b8078..f011746f 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -24,7 +24,7 @@
     <string name="delete_note_only">This will delete the note only.</string>
     <string name="delete_file_itself">Delete the file itself too</string>
     <string name="note_saved_successfully">Note saved successfully</string>
-    <string name="display_success_message">Display success message after saving a note</string>
+    <string name="display_success_message">Display save success message</string>
 
     <!-- Settings -->
     <string name="widget_note">Widget Notiz</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index d3fd4d3f..9e814000 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -24,7 +24,7 @@
     <string name="delete_note_only">This will delete the note only.</string>
     <string name="delete_file_itself">Delete the file itself too</string>
     <string name="note_saved_successfully">Note \"%1$s\" saved successfully</string>
-    <string name="display_success_message">Display success message after saving a note</string>
+    <string name="display_success_message">Display save success message</string>
 
     <!-- Settings -->
     <string name="note_font_size">Tamaño de fuente</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index a3ff6e0a..5e7c85a0 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -24,7 +24,7 @@
     <string name="delete_note_only">This will delete the note only.</string>
     <string name="delete_file_itself">Delete the file itself too</string>
     <string name="note_saved_successfully">Note \"%1$s\" saved successfully</string>
-    <string name="display_success_message">Display success message after saving a note</string>
+    <string name="display_success_message">Display save success message</string>
 
     <!-- Settings -->
     <string name="widget_note">Note utilisée dans le widget</string>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 5e76b145..6a9d3243 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -24,7 +24,7 @@
     <string name="delete_note_only">This will delete the note only.</string>
     <string name="delete_file_itself">Delete the file itself too</string>
     <string name="note_saved_successfully">Note \"%1$s\" saved successfully</string>
-    <string name="display_success_message">Display success message after saving a note</string>
+    <string name="display_success_message">Display save success message</string>
 
     <!-- Settings -->
     <string name="widget_note">A widget-ben használt jegyzet</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index bd912ef8..59e367d4 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -24,7 +24,7 @@
     <string name="delete_note_only">This will delete the note only.</string>
     <string name="delete_file_itself">Delete the file itself too</string>
     <string name="note_saved_successfully">Note \"%1$s\" saved successfully</string>
-    <string name="display_success_message">Display success message after saving a note</string>
+    <string name="display_success_message">Display save success message</string>
 
     <!-- Settings -->
     <string name="note_font_size">Note font size</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index fb6fdf37..c1d48caa 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -24,7 +24,7 @@
     <string name="delete_note_only">This will delete the note only.</string>
     <string name="delete_file_itself">Delete the file itself too</string>
     <string name="note_saved_successfully">Note \"%1$s\" saved successfully</string>
-    <string name="display_success_message">Display success message after saving a note</string>
+    <string name="display_success_message">Display save success message</string>
 
     <!-- Settings -->
     <string name="note_font_size">メモのフォントサイズ</string>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index 2408fb75..a07b2391 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -24,7 +24,7 @@
     <string name="delete_note_only">This will delete the note only.</string>
     <string name="delete_file_itself">Delete the file itself too</string>
     <string name="note_saved_successfully">Note \"%1$s\" saved successfully</string>
-    <string name="display_success_message">Display success message after saving a note</string>
+    <string name="display_success_message">Display save success message</string>
 
     <!-- Settings -->
     <string name="note_font_size">Tamanho do texto da nota</string>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index c67d08fa..92ec007f 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -24,7 +24,7 @@
     <string name="delete_note_only">This will delete the note only.</string>
     <string name="delete_file_itself">Delete the file itself too</string>
     <string name="note_saved_successfully">Note \"%1$s\" saved successfully</string>
-    <string name="display_success_message">Display success message after saving a note</string>
+    <string name="display_success_message">Display save success message</string>
 
     <!-- Settings -->
     <string name="note_font_size">Note font size</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ae4b6869..b6b7e66d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -24,7 +24,7 @@
     <string name="delete_note_only">This will delete the note only.</string>
     <string name="delete_file_itself">Delete the file itself too</string>
     <string name="note_saved_successfully">Note \"%1$s\" saved successfully</string>
-    <string name="display_success_message">Display success message after saving a note</string>
+    <string name="display_success_message">Display save success message</string>
 
     <!-- Settings -->
     <string name="widget_note">Note used in widget</string>