diff --git a/src/main/webapp/js/filters.js b/src/main/webapp/js/filters.js
index b0128593..e9341b4e 100644
--- a/src/main/webapp/js/filters.js
+++ b/src/main/webapp/js/filters.js
@@ -1,5 +1,8 @@
 var module = angular.module('commafeed.filters', []);
 
+/**
+ * smart date formatter
+ */
 module.filter('entryDate', function() {
 	return function(timestamp, defaultValue) {
 		if (!timestamp) {
@@ -18,22 +21,52 @@ module.filter('entryDate', function() {
 	};
 });
 
+/**
+ * rewrites iframes to use https if commafeed uses https
+ */
+module.filter('iframeHttpsRewrite', function() {
+	return function(html) {
+		var result = html;
+		if (location.protocol === 'https:') {
+			var wrapper = $('<div></div>').html(html);
+			$('iframe', wrapper).each(function(i, elem) {
+				var e = $(elem);
+				e.attr('src', e.attr('src').replace(/^http:\/\//i, 'https://'));
+			});
+			result = wrapper.html();
+		}
+		return result;
+	};
+});
+
+/**
+ * escapes the url
+ */
 module.filter('escape', function() {
 	return encodeURIComponent;
 });
 
+/**
+ * returns a trusted html content
+ */
 module.filter('trustHtml', ['$sce', function($sce) {
 	return function(val) {
 		return $sce.trustAsHtml(val);
 	};
 }]);
 
+/**
+ * returns a trusted url
+ */
 module.filter('trustUrl', ['$sce', function($sce) {
 	return function(val) {
 		return $sce.trustAsResourceUrl(val);
 	};
 }]);
 
+/**
+ * add the 'highlight-search' class to text matching keywords
+ */
 module.filter('highlight', function() {
 	return function(html, keywords) {
 		if (keywords) {
diff --git a/src/main/webapp/templates/feeds.view.html b/src/main/webapp/templates/feeds.view.html
index 3d3e00d1..3303547c 100644
--- a/src/main/webapp/templates/feeds.view.html
+++ b/src/main/webapp/templates/feeds.view.html
@@ -56,7 +56,7 @@
 				</div>
 
 				<div class="entry-body-content">
-					<div ng-bind-html="entry.content | trustHtml | highlight:keywords"></div>
+					<div ng-bind-html="entry.content | iframeHttpsRewrite| highlight:keywords | trustHtml"></div>
 					<div class="entry-enclosure" ng-if="entry.enclosureType">
 						<video controls ng-if="entry.enclosureType && entry.enclosureType.indexOf('video') == 0">
 							<source ng-src="{{entry.enclosureUrl | trustUrl}}" type="{{entry.enclosureType}}" />