diff --git a/css/thread.css b/css/thread.css
index 049165780c799beed80f45e1e4fc8f1f24a0cb65..cdf25a7200d7b0365283e88a2fe6760c66c86fa7 100644
--- a/css/thread.css
+++ b/css/thread.css
@@ -394,7 +394,7 @@
 .thread-body blockquote,
 .thread-body pre {
 	font-size: 14px;
-	line-height: 1.25rem;
+	line-height: 1.4rem;
 }
 
 /* Adjust plain/text messages posted as <pre> in the thread body to show in
diff --git a/js/redactor-fonts.js b/js/redactor-fonts.js
index a052e57ec8a00c1389c5849ea8f501f4a4bda73a..bbf2e99367c51fcc4a997626beb254d5aab893e4 100644
--- a/js/redactor-fonts.js
+++ b/js/redactor-fonts.js
@@ -145,28 +145,19 @@ RedactorPlugins.textdirection = {
 
         var button = this.buttonAdd('textdirection', __('Change Text Direction'),
             false, dropdown);
+
+        if (this.opts.direction)
+            this.setRtl();
     },
     setRtl: function()
     {
-        if (!this.opts.linebreaks) {
-            this.bufferSet();
-            this.blockSetAttr('dir', 'rtl');
-        }
-        else {
-            this.$editor.attr('dir', 'rtl');
-        }
-        this.$box.removeClass('ltr').addClass('rtl');
+        this.bufferSet();
+        this.blockSetAttr('dir', 'rtl');
 
     },
     setLtr: function()
     {
-        if (!this.opts.linebreaks) {
-            this.bufferSet();
-            this.blockSetAttr('dir', 'ltr');
-        }
-        else {
-            this.$editor.attr('dir', 'ltr');
-        }
-        this.$box.removeClass('rtl').addClass('ltr');
+        this.bufferSet();
+        this.blockSetAttr('dir', 'ltr');
     }
 };
diff --git a/js/redactor-osticket.js b/js/redactor-osticket.js
index cded2e1f3ffdc7d425428155eec3cf2a0815777d..8c19159b387f8fe2209e3e12604bbb510f91ab74 100644
--- a/js/redactor-osticket.js
+++ b/js/redactor-osticket.js
@@ -233,7 +233,7 @@ $(function() {
                 'plugins': [],
                 'imageGetJson': 'ajax.php/draft/images/browse',
                 'syncBeforeCallback': captureImageSizes,
-                'linebreaks': true,
+                'linebreaks': !$('html').hasClass('rtl'),
                 'tabFocus': false,
                 'toolbarFixedBox': true,
                 'focusCallback': function() { this.$box.addClass('no-pjax'); },
diff --git a/scp/css/scp.css b/scp/css/scp.css
index a085fe39f1eb364df804b57fd0a35c9c30f7d98b..3fe5aae23ca5e623bb59b101693e10d58df47a28 100644
--- a/scp/css/scp.css
+++ b/scp/css/scp.css
@@ -782,9 +782,8 @@ h2 .reload {
 }
 
 #threads li a {
-    display:block;
+    display:inline-block;
     width:auto;
-    float:left;
     height:30px;
     line-height:30px;
     border-top:1px solid #F4FAFF;