diff --git a/Mac/MainWindow/Detail/styleSheet.css b/Mac/MainWindow/Detail/styleSheet.css
index a1ebd013d..bf82522ae 100644
--- a/Mac/MainWindow/Detail/styleSheet.css
+++ b/Mac/MainWindow/Detail/styleSheet.css
@@ -125,12 +125,17 @@ code, pre {
 pre  {
 	white-space: pre-wrap;
 }
-img, figure, video, iframe, div {
+img, figure, video, div {
 	max-width: 100%;
 	height: auto !important;
 	margin: 0 auto;
 }
 
+iframe {
+	max-width: 100%;
+	margin: 0 auto;
+}
+
 figcaption {
 	font-size: 14px;
 	line-height: 1.3em;
diff --git a/Shared/Article Rendering/ArticleRenderer.swift b/Shared/Article Rendering/ArticleRenderer.swift
index 56f5fd97f..3bf7569ab 100644
--- a/Shared/Article Rendering/ArticleRenderer.swift	
+++ b/Shared/Article Rendering/ArticleRenderer.swift	
@@ -324,9 +324,18 @@ private extension ArticleRenderer {
 		s += """
 
 		<script type="text/javascript">
+		function stripStylesFromElement(element, propertiesToStrip) {
+			for (name of propertiesToStrip) {
+				element.style.removeProperty(name);
+			}
+		}
+
 		var init = {
 			wrapFrames: function () {
 				document.querySelectorAll("iframe").forEach(element => {
+					if (element.height > 0 || parseInt(element.style.height) > 0)
+						return;
+		
 					var wrapper = document.createElement("div");
 					wrapper.classList.add("iframeWrap");
 					element.parentNode.insertBefore(wrapper, element);
@@ -335,7 +344,7 @@ private extension ArticleRenderer {
 			},
 			stripStyles: function() {
 				document.getElementsByTagName("body")[0].querySelectorAll("style, link[rel=stylesheet]").forEach(element => element.remove());
-				document.getElementsByTagName("body")[0].querySelectorAll("[style]").forEach(element => element.removeAttribute("style"));
+				document.getElementsByTagName("body")[0].querySelectorAll("[style]").forEach(element => stripStylesFromElement(element, ["color", "background", "font"]));
 			},
 			linkHover: function() {
 				var anchors = document.getElementsByTagName("a");