diff --git a/Clover/app/src/main/java/org/floens/chan/core/ChanPreferences.java b/Clover/app/src/main/java/org/floens/chan/core/ChanPreferences.java
index d39bbdd5..8d8489a0 100644
--- a/Clover/app/src/main/java/org/floens/chan/core/ChanPreferences.java
+++ b/Clover/app/src/main/java/org/floens/chan/core/ChanPreferences.java
@@ -41,6 +41,10 @@ public class ChanPreferences {
         return p().getString("preference_default_email", "");
     }
 
+    public static boolean getPinOnPost() {
+        return p().getBoolean("preference_pin_on_post", false);
+    }
+
     public static boolean getDeveloper() {
         return p().getBoolean("preference_developer", false);
     }
diff --git a/Clover/app/src/main/java/org/floens/chan/ui/fragment/ReplyFragment.java b/Clover/app/src/main/java/org/floens/chan/ui/fragment/ReplyFragment.java
index 27031e21..31fbf64e 100644
--- a/Clover/app/src/main/java/org/floens/chan/ui/fragment/ReplyFragment.java
+++ b/Clover/app/src/main/java/org/floens/chan/ui/fragment/ReplyFragment.java
@@ -57,7 +57,6 @@ import org.floens.chan.core.ChanPreferences;
 import org.floens.chan.core.manager.ReplyManager;
 import org.floens.chan.core.manager.ReplyManager.ReplyResponse;
 import org.floens.chan.core.model.Loadable;
-import org.floens.chan.core.model.Pin;
 import org.floens.chan.core.model.Reply;
 import org.floens.chan.ui.ViewFlipperAnimations;
 import org.floens.chan.ui.view.LoadView;
@@ -517,7 +516,7 @@ public class ReplyFragment extends DialogFragment {
             Toast.makeText(context, R.string.reply_success, Toast.LENGTH_SHORT).show();
 
             // Pin thread on successful post
-            if (loadable.isThreadMode()) {
+            if (ChanPreferences.getPinOnPost() && loadable.isThreadMode()) {
                 ChanApplication.getWatchManager().addPin(loadable);
             }
 
diff --git a/Clover/app/src/main/res/values/strings.xml b/Clover/app/src/main/res/values/strings.xml
index 5d29cbed..63ad97ff 100644
--- a/Clover/app/src/main/res/values/strings.xml
+++ b/Clover/app/src/main/res/values/strings.xml
@@ -164,6 +164,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
     <string name="preference_default_name">Default name</string>
     <string name="preference_default_email">Default email</string>
+    <string name="preference_pin_on_post">Pin thread on post</string>
 
     <string name="preference_about">About</string>
     <string name="preference_licenses">Open Source Licenses</string>
diff --git a/Clover/app/src/main/res/xml/preference.xml b/Clover/app/src/main/res/xml/preference.xml
index 6696e4fa..10bfd164 100644
--- a/Clover/app/src/main/res/xml/preference.xml
+++ b/Clover/app/src/main/res/xml/preference.xml
@@ -80,6 +80,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
         <EditTextPreference
             android:key="preference_default_email"
             android:title="@string/preference_default_email" />
+
+        <CheckBoxPreference
+            android:defaultValue="false"
+            android:key="preference_pin_on_post"
+            android:title="@string/preference_pin_on_post" />
     </PreferenceCategory>
 
     <PreferenceCategory