diff --git a/addons/website_forum/static/src/css/website_forum.css b/addons/website_forum/static/src/css/website_forum.css
index 75befd62b1c..54a7f47380f 100644
--- a/addons/website_forum/static/src/css/website_forum.css
+++ b/addons/website_forum/static/src/css/website_forum.css
@@ -24,16 +24,25 @@
 .question .badge-active {
   background-color: #428bca;
 }
+.question img {
+  max-width: 600px;
+  height: auto !important;
+}
+
+.forum_answer img {
+  max-width: 600px;
+  height: auto !important;
+}
+
+img.img-avatar {
+  max-width: 50px;
+  margin-right: 10px;
+}
 
 .oe_grey {
   background-color: #eeeeee;
 }
 
-.img-avatar {
-  max-width: 50px;
-  margin-right: 10px;
-}
-
 .badge-gold {
   color: #ffcc00;
 }
diff --git a/addons/website_forum/static/src/css/website_forum.sass b/addons/website_forum/static/src/css/website_forum.sass
index d800d293de8..4a16f48e77e 100644
--- a/addons/website_forum/static/src/css/website_forum.sass
+++ b/addons/website_forum/static/src/css/website_forum.sass
@@ -19,14 +19,23 @@
     margin-left: 4px
   .badge-active
     background-color: #428bca
+  img
+    max-width: 600px
+    height: auto !important
+
+.forum_answer
+  img
+    max-width: 600px
+    height: auto !important
+
+img.img-avatar
+  max-width: 50px
+  margin-right: 10px
+
 
 .oe_grey
   background-color: #eeeeee
 
-.img-avatar
-  max-width: 50px
-  margin-right: 10px
-
 .badge-gold
   color: #ffcc00