diff --git a/desktop/org.yorba.geary.gschema.xml b/desktop/org.yorba.geary.gschema.xml
index 2c435b3..6738958 100644
--- a/desktop/org.yorba.geary.gschema.xml
+++ b/desktop/org.yorba.geary.gschema.xml
@@ -1,7 +1,14 @@
 <schemalist>
 
 <schema id="org.yorba.geary" path="/org/yorba/geary/">
-    
+
+   <key name="bottom-reply" type="b">
+        <default>false</default>
+        <summary>reply below the quoted message</summary>
+        <description>True if we should put the signature and cursor
+	below the message we are replying to, false otherwise.</description>
+    </key>
+  
     <key name="window-maximize" type="b">
         <default>false</default>
         <summary>maximize window</summary>
diff --git a/src/client/application/geary-config.vala b/src/client/application/geary-config.vala
index 221cb34..f63fa42 100644
--- a/src/client/application/geary-config.vala
+++ b/src/client/application/geary-config.vala
@@ -23,6 +23,7 @@ public class Configuration {
     public const string STARTUP_NOTIFICATIONS_KEY = "startup-notifications";
     public const string ASK_OPEN_ATTACHMENT_KEY = "ask-open-attachment";
     public const string COMPOSE_AS_HTML_KEY = "compose-as-html";
+    public const string BOTTOM_REPLY_KEY = "bottom-reply";
     
     public Settings settings { get; private set; }
     
@@ -91,6 +92,11 @@ public class Configuration {
         get { return settings.get_boolean(STARTUP_NOTIFICATIONS_KEY); }
         set { set_boolean(STARTUP_NOTIFICATIONS_KEY, value); }
     }
+
+    public bool bottom_reply {
+        get { return settings.get_boolean(BOTTOM_REPLY_KEY); }
+        set { set_boolean(BOTTOM_REPLY_KEY, value); }
+    }
     
     private const string CLOCK_FORMAT_KEY = "clock-format";
     private const string TIME_FORMAT_KEY = "time-format";
diff --git a/src/client/composer/composer-widget.vala b/src/client/composer/composer-widget.vala
index 18b5332..f8cde0d 100644
--- a/src/client/composer/composer-widget.vala
+++ b/src/client/composer/composer-widget.vala
@@ -498,7 +498,7 @@ public class ComposerWidget : Gtk.EventBox {
                     body_html = "\n\n" + Geary.RFC822.Utils.quote_email_for_reply(referred, quote,
                         Geary.RFC822.TextFormat.HTML);
                     pending_attachments = referred.attachments;
-                    if (quote != null)
+                    if (quote != null || GearyApplication.instance.config.bottom_reply)
                         top_posting = false;
                     else
                         can_delete_quote = true;
