diff --git a/site/js/coffee/misc.coffee b/site/js/coffee/misc.coffee
index fba42d5..8ea10cd 100644
--- a/site/js/coffee/misc.coffee
+++ b/site/js/coffee/misc.coffee
@@ -91,7 +91,11 @@
 )
 
 ponymail_quote_regex = new RegExp(
-    "((?:\r?\n)((on .+ wrote:[\r\n]+)|(sent from my .+)|(>+[ \t]+[^\r\n]*\r?\n[^\n]*\n*)+)+)+", "mi"
+    "((?:\r?\n)((on .+ wrote:[\r\n]+)|(sent from my .+)|(>+([ \t][^\r\n]*|[ \t]*)\r?\n)+)+)+", "mi"
+    #                                                      ^                    ^
+    # This section matches at least one space plus any text, or optional whitespace only
+    # Quotes shold always have at least one space before any text, but don't need spaces
+    # if there is no text 
 )
 
 ###*
diff --git a/site/js/ponymail-coffee.js b/site/js/ponymail-coffee.js
index 18e2b90..2cf75f0 100644
--- a/site/js/ponymail-coffee.js
+++ b/site/js/ponymail-coffee.js
@@ -2429,7 +2429,7 @@
 
 ponymail_url_regex = new RegExp("(" + "(?:(?:[a-z]+)://)" + "(?:\\S+(?::\\S*)?@)?" + "(?:" + "([01][0-9][0-9]|2[0-4][0-9]|25[0-5])" + "|" + "(?:(?:[a-z\\u00a1-\\uffff0-9]-*)*[a-z\\u00a1-\\uffff0-9]+)" + "(?:\\.(?:[a-z\\u00a1-\\uffff0-9]-*)*[a-z\\u00a1-\\uffff0-9]+)*" + "(?:\\.(?:[a-z\\u00a1-\\uffff]{2,}))" + "\\.?" + ")" + "(?::\\d{2,5})?" + "(?:[/?#]([^,<>()\\[\\] \\t\\r\\n]|(<[^:\\s]*?>|\\([^:\\s]*?\\)|\\[[^:\\s]*?\\]))*)?" + ")\\.?", "mi");
 
-ponymail_quote_regex = new RegExp("((?:\r?\n)((on .+ wrote:[\r\n]+)|(sent from my .+)|(>+[ \t]+[^\r\n]*\r?\n[^\n]*\n*)+)+)+", "mi");
+ponymail_quote_regex = new RegExp("((?:\r?\n)((on .+ wrote:[\r\n]+)|(sent from my .+)|(>+([ \t][^\r\n]*|[ \t]*)\r?\n)+)+)+", "mi");
 
 
 /**
@@ -2446,7 +2446,7 @@
   var a, arr, i, j, num, out, ref, res;
   arr = mid.split("@");
 
-  /* IF arr is 2 bits, it's fine to shorten it (meduim/long generator). if 3, then potentially not (short generator) */
+  /* IF arr is 2 bits, it's fine to shorten it (medium/long generator). if 3, then potentially not (short generator) */
   if (arr.length === 2 && (pm_config && pm_config.shortLinks)) {
     out = "";