diff --git a/src/Wallabag/CoreBundle/Resources/views/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/Entry/entries.html.twig
index 3f5cf4609..0d295431e 100644
--- a/src/Wallabag/CoreBundle/Resources/views/Entry/entries.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/Entry/entries.html.twig
@@ -37,7 +37,11 @@
{% trans %}delete{% endtrans %}
{{ entry.domainName }}
- {{ entry.content|striptags|slice(0, 300) }}…
+ {% if entry.previewPicture is null %}
+ {{ entry.content|striptags|slice(0, 300) }}…
+ {% else %}
+
+ {% endif %}
{% endfor %}
{% endif %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/Entry/entry.html.twig b/src/Wallabag/CoreBundle/Resources/views/Entry/entry.html.twig
index 18cfd59d2..f58d0399b 100644
--- a/src/Wallabag/CoreBundle/Resources/views/Entry/entry.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/Entry/entry.html.twig
@@ -31,6 +31,9 @@
{% for tag in entry.tags %}{{ tag.label }}{% endfor %}
{{ render(controller( "WallabagCoreBundle:Tag:addTagForm", { 'id': entry.id } )) }}
+ {% if entry.previewPicture is not null %}
+
+ {% endif %}
{{ entry.content | raw }}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/css/main.css b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/css/main.css
index 6090face6..72a7b2054 100755
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/css/main.css
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/css/main.css
@@ -448,6 +448,10 @@ footer a {
}
*/
+img.preview {
+ max-width: 100%;
+}
+
.entry p {
color: #666;
font-size: 0.9em;