diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsBehaviorFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsBehaviorFragment.java
index af64cd9af..26675cbe1 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsBehaviorFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsBehaviorFragment.java
@@ -1,6 +1,7 @@
 package org.joinmastodon.android.fragments.settings;
 
 import android.os.Bundle;
+import android.provider.Settings;
 
 import androidx.annotation.StringRes;
 
@@ -32,6 +33,9 @@ public class SettingsBehaviorFragment extends BaseSettingsFragment<Void> impleme
 	private ListItem<Void> prefixRepliesItem, replyVisibilityItem;
 	private CheckableListItem<Void> forwardReportsItem, remoteLoadingItem, showBoostsItem, showRepliesItem, loadNewPostsItem, seeNewPostsBtnItem, overlayMediaItem;
 
+	// MOSHIDON
+    private CheckableListItem<Void> mentionRebloggerAutomaticallyItem, hapticFeedbackItem;
+
 	@Override
 	public void onCreate(Bundle savedInstanceState){
 		super.onCreate(savedInstanceState);
@@ -56,7 +60,9 @@ public class SettingsBehaviorFragment extends BaseSettingsFragment<Void> impleme
 				forwardReportsItem=new CheckableListItem<>(R.string.sk_settings_forward_report_default, 0, CheckableListItem.Style.SWITCH, GlobalUserPreferences.forwardReportDefault, R.drawable.ic_fluent_arrow_forward_24_regular, ()->toggleCheckableItem(forwardReportsItem)),
 				loadNewPostsItem=new CheckableListItem<>(R.string.sk_settings_load_new_posts, 0, CheckableListItem.Style.SWITCH, GlobalUserPreferences.loadNewPosts, R.drawable.ic_fluent_arrow_sync_24_regular, this::onLoadNewPostsClick),
 				seeNewPostsBtnItem=new CheckableListItem<>(R.string.sk_settings_show_new_posts_button, 0, CheckableListItem.Style.SWITCH, GlobalUserPreferences.showNewPostsButton, R.drawable.ic_fluent_arrow_up_24_regular, ()->toggleCheckableItem(seeNewPostsBtnItem)),
-				remoteLoadingItem=new CheckableListItem<>(R.string.sk_settings_allow_remote_loading, R.string.sk_settings_allow_remote_loading_explanation, CheckableListItem.Style.SWITCH, GlobalUserPreferences.allowRemoteLoading, R.drawable.ic_fluent_communication_24_regular, ()->toggleCheckableItem(remoteLoadingItem), true),
+				remoteLoadingItem=new CheckableListItem<>(R.string.sk_settings_allow_remote_loading, R.string.sk_settings_allow_remote_loading_explanation, CheckableListItem.Style.SWITCH, GlobalUserPreferences.allowRemoteLoading, R.drawable.ic_fluent_communication_24_regular, ()->toggleCheckableItem(remoteLoadingItem)),
+				mentionRebloggerAutomaticallyItem=new CheckableListItem<>(R.string.mo_mention_reblogger_automatically, 0, CheckableListItem.Style.SWITCH, GlobalUserPreferences.mentionRebloggerAutomatically, R.drawable.ic_fluent_comment_mention_24_regular, ()->toggleCheckableItem(mentionRebloggerAutomaticallyItem)),
+				hapticFeedbackItem=new CheckableListItem<>(R.string.mo_haptic_feedback, R.string.mo_setting_haptic_feedback_summary, CheckableListItem.Style.SWITCH, GlobalUserPreferences.hapticFeedback, R.drawable.ic_fluent_phone_vibrate_24_regular,()->toggleCheckableItem(hapticFeedbackItem), true),
 				showBoostsItem=new CheckableListItem<>(R.string.sk_settings_show_boosts, 0, CheckableListItem.Style.SWITCH, lp.showBoosts, R.drawable.ic_fluent_arrow_repeat_all_24_regular, ()->toggleCheckableItem(showBoostsItem)),
 				showRepliesItem=new CheckableListItem<>(R.string.sk_settings_show_replies, 0, CheckableListItem.Style.SWITCH, lp.showReplies, R.drawable.ic_fluent_arrow_reply_24_regular, ()->toggleCheckableItem(showRepliesItem))
 		));
@@ -173,6 +179,8 @@ public class SettingsBehaviorFragment extends BaseSettingsFragment<Void> impleme
 		GlobalUserPreferences.loadNewPosts=loadNewPostsItem.checked;
 		GlobalUserPreferences.showNewPostsButton=seeNewPostsBtnItem.checked;
 		GlobalUserPreferences.allowRemoteLoading=remoteLoadingItem.checked;
+		GlobalUserPreferences.mentionRebloggerAutomatically=mentionRebloggerAutomaticallyItem.checked;
+		GlobalUserPreferences.hapticFeedback=hapticFeedbackItem.checked;
 		GlobalUserPreferences.save();
 		AccountLocalPreferences lp=getLocalPrefs();
 		lp.showBoosts=showBoostsItem.checked;
diff --git a/mastodon/src/main/res/drawable/ic_fluent_phone_vibrate_24_regular.xml b/mastodon/src/main/res/drawable/ic_fluent_phone_vibrate_24_regular.xml
new file mode 100644
index 000000000..7d20e5607
--- /dev/null
+++ b/mastodon/src/main/res/drawable/ic_fluent_phone_vibrate_24_regular.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M15.749,2C16.992,2 17.999,3.007 17.999,4.25V19.75C17.999,20.993 16.992,22 15.749,22H8.249C7.006,22 5.999,20.993 5.999,19.75V4.25C5.999,3.007 7.006,2 8.249,2H15.749ZM15.749,3.5H8.249C7.835,3.5 7.499,3.836 7.499,4.25V19.75C7.499,20.164 7.835,20.5 8.249,20.5H15.749C16.163,20.5 16.499,20.164 16.499,19.75V4.25C16.499,3.836 16.163,3.5 15.749,3.5ZM13.248,17.5C13.662,17.499 13.998,17.835 13.999,18.249C14,18.663 13.664,18.999 13.25,19L10.75,19.004C10.336,19.004 10,18.669 9.999,18.255C9.998,17.841 10.334,17.504 10.748,17.504L13.248,17.5ZM20.651,8.13L20.695,8.221L21.278,9.678C21.611,10.509 21.516,11.447 21.034,12.193L20.925,12.349L20.774,12.551C20.541,12.861 20.467,13.259 20.567,13.628L20.613,13.765L21.195,15.222C21.349,15.606 21.162,16.042 20.778,16.196C20.425,16.337 20.029,16.192 19.847,15.87L19.803,15.778L19.22,14.322C18.888,13.491 18.982,12.553 19.464,11.807L19.573,11.651L19.725,11.449C19.957,11.139 20.031,10.741 19.931,10.372L19.885,10.235L19.303,8.779C19.149,8.394 19.336,7.957 19.721,7.804C20.038,7.677 20.39,7.782 20.59,8.038L20.651,8.13ZM4.151,8.13L4.195,8.221L4.778,9.678C5.111,10.509 5.016,11.447 4.534,12.193L4.425,12.349L4.273,12.551C4.041,12.861 3.967,13.259 4.067,13.628L4.113,13.765L4.695,15.222C4.849,15.606 4.662,16.042 4.278,16.196C3.925,16.337 3.529,16.192 3.347,15.87L3.303,15.778L2.72,14.322C2.387,13.491 2.482,12.553 2.964,11.807L3.073,11.651L3.225,11.449C3.457,11.139 3.531,10.741 3.431,10.372L3.385,10.235L2.803,8.779C2.649,8.394 2.836,7.957 3.221,7.804C3.538,7.677 3.89,7.782 4.09,8.038L4.151,8.13Z"
+      android:fillColor="#212121"/>
+</vector>