diff --git a/src/main/java/com/commafeed/backend/feeds/FeedUtils.java b/src/main/java/com/commafeed/backend/feeds/FeedUtils.java
index 737da59e..c124125b 100644
--- a/src/main/java/com/commafeed/backend/feeds/FeedUtils.java
+++ b/src/main/java/com/commafeed/backend/feeds/FeedUtils.java
@@ -126,8 +126,8 @@ public class FeedUtils {
 			whitelist.addAttributes("colgroup", "span", "width");
 			whitelist.addAttributes("iframe", "src", "height", "width",
 					"allowfullscreen", "frameborder", "style");
-			whitelist.addAttributes("img", "alt", "height", "src", "title",
-					"width");
+			whitelist.addAttributes("img", "align", "alt", "height", "src",
+					"title", "width");
 			whitelist.addAttributes("ol", "start", "type");
 			whitelist.addAttributes("q", "cite");
 			whitelist.addAttributes("table", "border", "bordercolor",
diff --git a/src/main/webapp/sass/components/_entry-list.scss b/src/main/webapp/sass/components/_entry-list.scss
index e2f829a9..6c562cc7 100644
--- a/src/main/webapp/sass/components/_entry-list.scss
+++ b/src/main/webapp/sass/components/_entry-list.scss
@@ -104,16 +104,19 @@
 	font-weight: normal;
 }
 
-#feed-accordion .entry-body img {
-	display: block;
-}
-
 #feed-accordion  .entry-body-content {
 	max-width: 650px;
 	color: black;
+	padding-bottom: 10px;
+}
+
+#feed-accordion .entry-enclosure {
+	clear: both;
+	padding-top: 10px;
 }
 
 #feed-accordion .entry-buttons {
+	clear: both;
 	background-color: #fafafa;
 	padding: 3px 0px;
 	border-top: 1px solid #ebebeb;
diff --git a/src/main/webapp/templates/feeds.view.html b/src/main/webapp/templates/feeds.view.html
index a50397bd..466d286e 100644
--- a/src/main/webapp/templates/feeds.view.html
+++ b/src/main/webapp/templates/feeds.view.html
@@ -45,18 +45,20 @@
 
 				<div class="entry-body-content">
 					<div ng-bind-html-unsafe="entry.content"></div>
-					<video controls ui-if="entry.enclosureType && entry.enclosureType.indexOf('video') == 0">
-						<source src="{{entry.enclosureUrl}}" type="{{entry.enclosureType}}" />
-					</video>
-					<audio controls ui-if="entry.enclosureType && entry.enclosureType.indexOf('audio') == 0">
-						<source src="{{entry.enclosureUrl}}" type="{{entry.enclosureType}}" />
-					</audio>
-					<div ui-if="entry.enclosureType && entry.enclosureType.indexOf('image') == 0">
-						<img ng-src="{{entry.enclosureUrl}}" />
+					<div class="entry-enclosure" ui-if="entry.enclosureType">
+						<video controls ui-if="entry.enclosureType && entry.enclosureType.indexOf('video') == 0">
+							<source src="{{entry.enclosureUrl}}" type="{{entry.enclosureType}}" />
+						</video>
+						<audio controls ui-if="entry.enclosureType && entry.enclosureType.indexOf('audio') == 0">
+							<source src="{{entry.enclosureUrl}}" type="{{entry.enclosureType}}" />
+						</audio>
+						<div ui-if="entry.enclosureType && entry.enclosureType.indexOf('image') == 0">
+							<img ng-src="{{entry.enclosureUrl}}" />
+						</div>
+						<a href="{{entry.enclosureUrl}}" target="_blank" ui-if="entry.enclosureType" download>
+							${global.download}
+						</a>
 					</div>
-					<a href="{{entry.enclosureUrl}}" target="_blank" ui-if="entry.enclosureType" download>
-						${global.download}
-					</a>
 				</div>
 				<div class="entry-buttons form-horizontal">