diff --git a/app/assets/stylesheets/application/topic-post.css.scss b/app/assets/stylesheets/application/topic-post.css.scss
index dd607358a70..1bd28793aa2 100644
--- a/app/assets/stylesheets/application/topic-post.css.scss
+++ b/app/assets/stylesheets/application/topic-post.css.scss
@@ -585,6 +585,8 @@
 
 .topic-body {
   position: relative;
+
+  // this is the little pointy bit of the speech bubble on the post, on the left side
   &:before,
   &:after {
     position: absolute;
diff --git a/app/assets/stylesheets/vendor/bootstrap.css.scss b/app/assets/stylesheets/vendor/bootstrap.css.scss
index 0e0d2e83155..3f0b9415d1d 100644
--- a/app/assets/stylesheets/vendor/bootstrap.css.scss
+++ b/app/assets/stylesheets/vendor/bootstrap.css.scss
@@ -958,17 +958,20 @@ body {
   input, textarea, select, .uneditable-input {
     color: #222222;
   }
+
   p, pre, li, ul {
     font-size: 14px;
   }
   p {
     line-height: 20px;
   }
+
   code, pre {
     font-family: Consolas, Menlo, Monaco, "Lucida Console", "Liberation Mono", "DejaVu Sans Mono", "Bitstream Vera Sans Mono", "Courier New", monospace, serif;
   }
+
   h1, h2, h3, h4, h5, h6 {
-    margin: 0;
+    margin: 20px 0 10px;
     font-family: inherit;
     font-weight: bold;
     color: inherit;
@@ -1016,6 +1019,12 @@ body {
     color: #999999;
     text-transform: uppercase;
   }
+
+  // this removes the unwanted top margin on a paragraph under a heading
+  h1+p, h2+p, h3+p, h4+p, h5+p, h6+p {
+    margin-top:0px;
+  }
+
   blockquote {
     margin: 15px 0 8px;
   }