diff --git a/app/src/main/java/com/nutomic/syncthingandroid/activities/FolderActivity.java b/app/src/main/java/com/nutomic/syncthingandroid/activities/FolderActivity.java
index c0c7af56..24d1befd 100644
--- a/app/src/main/java/com/nutomic/syncthingandroid/activities/FolderActivity.java
+++ b/app/src/main/java/com/nutomic/syncthingandroid/activities/FolderActivity.java
@@ -431,15 +431,13 @@ public class FolderActivity extends SyncthingActivity
                 ? getIntent().getStringExtra(EXTRA_FOLDER_ID)
                 : generateRandomFolderId();
         mFolder.label = getIntent().getStringExtra(EXTRA_FOLDER_LABEL);
-        if (Build.VERSION.SDK_INT != Build.VERSION_CODES.M) {
-            // Scan every hour (in case real time change detection failed)
-            mFolder.rescanIntervalS = 3600;
-        }
-        else {
-            // FileObserver is broken on Marshmallow.
-            // https://github.com/syncthing/syncthing-android/issues/787
-            mFolder.rescanIntervalS = 300;
-        }
+        mFolder.fsWatcherEnabled = true;
+        mFolder.fsWatcherDelayS = 10;
+        /**
+         * Folder rescan interval defaults to 3600s as it is the default in
+         * syncthing when the file watcher is enabled and a new folder is created.
+         */
+        mFolder.rescanIntervalS = 3600;
         mFolder.versioning = new Folder.Versioning();
     }
 
diff --git a/app/src/main/java/com/nutomic/syncthingandroid/service/SyncthingService.java b/app/src/main/java/com/nutomic/syncthingandroid/service/SyncthingService.java
index 5cf9a497..77122a39 100644
--- a/app/src/main/java/com/nutomic/syncthingandroid/service/SyncthingService.java
+++ b/app/src/main/java/com/nutomic/syncthingandroid/service/SyncthingService.java
@@ -262,7 +262,7 @@ public class SyncthingService extends Service {
     }
 
     /**
-     * Stop Syncthing and all helpers like event processor, api handler and folder observers.
+     * Stop Syncthing and all helpers like event processor and api handler.
      *
      * Sets {@link #mCurrentState} to newState, and calls onKilledListener once Syncthing is killed.
      */
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e0949c20..12e3d25d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -349,10 +349,6 @@ Please report any problems you encounter via Github.</string>
 
     <string name="use_legacy_hashing_summary">Force Syncthing to use legacy hashing package for compatibility purposes</string>
 
-    <string name="use_folder_observer_title">Use deprecated change detection</string>
-
-    <string name="use_folder_observer_summary">Default: Disabled. Use deprecated android implementation to detect filesystem changes instead of SyncThing\'s new built-in feature.</string>
-
     <string name="restart_on_wakeup_title">Restart on Wakeup</string>
 
     <string name="restart_on_wakeup_summary">Default: Enabled. Disabling this feature may result in folder scans and device reconnects being delayed to save battery.</string>