diff --git a/app/assets/stylesheets/generic/timeline.scss b/app/assets/stylesheets/generic/timeline.scss
index 82ee41b71bd..ee3bf9c1b2d 100644
--- a/app/assets/stylesheets/generic/timeline.scss
+++ b/app/assets/stylesheets/generic/timeline.scss
@@ -58,6 +58,10 @@
         padding: 10px 15px;
         margin-left: 60px;
 
+        img {
+          max-width: 100%;
+        }
+
         &:after {
           content: '';
           display: block;
diff --git a/app/assets/stylesheets/sections/note_form.scss b/app/assets/stylesheets/sections/note_form.scss
index 26511d799f3..61a877a5e43 100644
--- a/app/assets/stylesheets/sections/note_form.scss
+++ b/app/assets/stylesheets/sections/note_form.scss
@@ -52,6 +52,10 @@
     }
   }
 
+  img {
+    max-width: 100%;
+  }
+
   .note_text {
     width: 100%;
   }