diff --git a/index.html b/index.html
index 5db22d9a0..f4b71d803 100644
--- a/index.html
+++ b/index.html
@@ -57,11 +57,14 @@
             <div class='sender'>{{ sender }}</div>
             <img class='avatar' src='{{ contact_avatar }}'>
             <div class='bubble bubble_context {{ bubble_class }}'>
-            <ul class='volley'>
-                <li class='message'>
-                {{ message }}
-                </li>
-            </ul>
+              <ul class='volley'>
+                  <li class='message'>
+                  {{ message }}
+                  </li>
+              </ul>
+              {{#attachments}}
+                <img src={{.}}>
+              {{/attachments}}
             </div>
         </script>
         <script type='text/x-tmpl-mustache' id='contact'>
diff --git a/stylesheets/index.css b/stylesheets/index.css
index 803486d85..cd370a32c 100644
--- a/stylesheets/index.css
+++ b/stylesheets/index.css
@@ -57,6 +57,10 @@ li.entry.outgoing .avatar {
   display: none;
 }
 
+li.entry img {
+  max-width: 100%;
+}
+
 .attachments img {
   width: 30px;
   height: 30px;