diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 03a1e708..d785d4ff 100644
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -11,6 +11,7 @@ a {
   }
 }
 
+
 .btn { 
   background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f1f1f1), color-stop(25%, #f1f1f1), to(#e6e6e6));
   background-image: -webkit-linear-gradient(#f1f1f1, #f1f1f1 25%, #e6e6e6);
@@ -1016,6 +1017,8 @@ p.time {
   @extend .prepend-top-20;
   @extend .append-bottom-20;
 
+  img { max-width: 100%; }
+
   pre {
     background: white !important;
     
@@ -1111,6 +1114,7 @@ p.time {
 
 // Fix issue with notes & lists creating a bunch of bottom borders.
 li.note {
+  img { max-width:100% }
   .note-title {
     li {
       border-bottom:none !important;
@@ -1121,3 +1125,9 @@ li.note {
     }
   }
 }
+
+.markdown { 
+  img { 
+    max-width:100%;
+  }
+}
diff --git a/app/views/projects/show.html.haml b/app/views/projects/show.html.haml
index ae92b1ca..27e38922 100644
--- a/app/views/projects/show.html.haml
+++ b/app/views/projects/show.html.haml
@@ -21,7 +21,7 @@
       = text_field_tag :project_clone, @project.url_to_repo, :class => "xlarge one_click_select git_clone_url"
 
 - if @project.description.present?
-  .prettyprint= markdown @project.description
+  .markdown.prettyprint= markdown @project.description
 - unless @events.blank?
   %br
   %h5.cgray