diff --git a/inc/functions.php b/inc/functions.php
index cfa3b353..28ada758 100755
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -2268,7 +2268,7 @@ function markup(&$body, $track_cites = false, $op = false) {
 	
 	$tracked_cites = array_unique($tracked_cites, SORT_REGULAR);
 
-	$body = preg_replace("/^\s*&gt;.*$/m", '<span class="quote">$0</span>', $body);
+	//$body = preg_replace("/^\s*&gt;.*$/m", '<span class="quote">$0</span>', $body);
 
 	if ($config['strip_superfluous_returns'])
 		$body = preg_replace('/\s+$/', '', $body);
@@ -2285,7 +2285,14 @@ function markup(&$body, $track_cites = false, $op = false) {
 				$paragraphDirection = "empty";
 			}
 			
-			$bodyNew .= "<p class=\"body-line {$paragraphDirection}\">" . $paragraph . "</p>";
+			if (strpos($paragraph, "&gt;")===0) {
+				$quoteClass = "quote";
+			}
+			else {
+				$quoteClass = "";
+			}
+			
+			$bodyNew .= "<p class=\"body-line {$paragraphDirection} {$quoteClass}\">" . $paragraph . "</p>";
 		}
 		
 		$body = $bodyNew;
diff --git a/stylesheets/style.css b/stylesheets/style.css
index 4057418e..f4a9b147 100644
--- a/stylesheets/style.css
+++ b/stylesheets/style.css
@@ -399,7 +399,7 @@ div.post div.body {
 div.post.reply {
   background: #D6DAF0;
   margin: 0.2em 4px;
-  padding: 0.2em 0.3em 0.5em 0.6em;
+  padding: 0.5em 0.3em 0.5em 0.6em;
   border-width: 1px;
   border-style: none solid solid none;
   border-color: #B7C5D9;
@@ -436,7 +436,7 @@ span.trip {
   color: #228854;
 }
 
-span.quote {
+.quote {
   color: #789922;
 }
 
@@ -1039,7 +1039,7 @@ span.pln {
 	display: block;
 	width: 100%;
 	padding: 0;
-	margin: 0;
+	margin: 0 0 0 0;
 	text-align: center;
 }
 #logo-link {