diff --git a/view/templates/email_notify_html.tpl b/view/templates/email_notify_html.tpl
index 94fac7447..d9eeb841f 100644
--- a/view/templates/email_notify_html.tpl
+++ b/view/templates/email_notify_html.tpl
@@ -1,4 +1,3 @@
-
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
 <html>
 <head>
@@ -6,28 +5,33 @@
 	<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
 </head>
 <body>
-<table style="border:1px solid #ccc">
+	<table style="border:1px solid #ccc">
 	<tbody>
-	<tr><td colspan="2" style="background:#084769; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;"><img style="width:32px;height:32px; float:left;" src='{{$siteurl}}/images/friendica-32.png'><div style="padding:7px; margin-left: 5px; float:left; font-size:18px;letter-spacing:1px;">{{$product}}</div><div style="clear: both;"></div></td></tr>
+		<tr>
+			<td colspan="2" style="background:#084769; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;">
+				<img style="width:32px;height:32px; float:left;" src='{{$siteurl}}/images/friendica-32.png'>
+				<div style="padding:7px; margin-left: 5px; float:left; font-size:18px;letter-spacing:1px;">{{$product}}</div>
+				<div style="clear: both;"></div>
+			</td>
+		</tr>
 
+		<tr><td colspan="2" style="padding-top:22px;">{{$preamble nofilter}}</td></tr>
 
-	<tr><td style="padding-top:22px;" colspan="2">{{$preamble}}</td></tr>
-
-
-	{{if $content_allowed}}
+{{if $content_allowed}}
 	{{if $source_photo}}
-	<tr><td style="padding-left:22px;padding-top:22px;width:60px;" valign="top" rowspan=3><a href="{{$source_link}}"><img style="border:0px;width:48px;height:48px;" src="{{$source_photo}}"></a></td>
-		<td style="padding-top:22px;"><a href="{{$source_link}}">{{$source_name}}</a></td></tr>
-	{{/if}}
-	<tr><td style="font-weight:bold;padding-bottom:5px;">{{$title}}</td></tr>
-	<tr><td style="padding-right:22px;">{{$htmlversion}}</td></tr>
-	{{/if}}
-	<tr><td style="padding-top:11px;" colspan="2">{{$hsitelink}}</td></tr>
-	<tr><td style="padding-bottom:11px;" colspan="2">{{$hitemlink}}</td></tr>
-	<tr><td></td><td>{{$thanks}}</td></tr>
-	<tr><td></td><td>{{$site_admin}}</td></tr>
+		<tr>
+			<td style="padding-left:22px;padding-top:22px;width:60px;" valign="top" rowspan=3><a href="{{$source_link}}"><img style="border:0px;width:48px;height:48px;" src="{{$source_photo}}"></a></td>
+			<td style="padding-top:22px;"><a href="{{$source_link}}">{{$source_name}}</a></td>
+		</tr>
+		{{/if}}
+		<tr><td style="font-weight:bold;padding-bottom:5px;">{{$title}}</td></tr>
+		<tr><td style="padding-right:22px;">{{$htmlversion nofilter}}</td></tr>
+{{/if}}
+		<tr><td colspan="2" style="padding-top:11px;">{{$hsitelink nofilter}}</td></tr>
+		<tr><td colspan="2" style="padding-bottom:11px;">{{$hitemlink nofilter}}</td></tr>
+		<tr><td></td><td>{{$thanks}}</td></tr>
+		<tr><td></td><td>{{$site_admin}}</td></tr>
 	</tbody>
-</table>
+	</table>
 </body>
 </html>
-
diff --git a/view/templates/photo_view.tpl b/view/templates/photo_view.tpl
index d5c3d6826..4f5be40fc 100644
--- a/view/templates/photo_view.tpl
+++ b/view/templates/photo_view.tpl
@@ -22,17 +22,17 @@
 {{/if}}
 {{if $tags.2}}<div id="tag-remove"><a href="{{$tags.2}}">{{$tags.3}}</a></div>{{/if}}
 
-{{if $edit}}{{$edit}}{{/if}}
+{{if $edit}}{{$edit nofilter}}{{/if}}
 
 {{if $likebuttons}}
 <div id="photo-like-div">
-	{{$likebuttons}}
-	{{$like}}
-	{{$dislike}}	
+	{{$likebuttons nofilter}}
+	{{$like nofilter}}
+	{{$dislike nofilter}}
 </div>
 {{/if}}
 
-{{$comments}}
+{{$comments nofilter}}
 
 {{$paginate nofilter}}
 
diff --git a/view/theme/frio/templates/photo_view.tpl b/view/theme/frio/templates/photo_view.tpl
index 1d39b16ee..359c42669 100644
--- a/view/theme/frio/templates/photo_view.tpl
+++ b/view/theme/frio/templates/photo_view.tpl
@@ -68,13 +68,13 @@
 		{{/if}}
 
 		{{* The part for editing the photo - only available for the edit subpage *}}
-		{{if $edit}}{{$edit}}{{/if}}
+		{{if $edit}}{{$edit nofilter}}{{/if}}
 
 		{{if $likebuttons}}
 		<div id="photo-like-div">
-			{{$likebuttons}}
-			{{$like}}
-			{{$dislike}}
+			{{$likebuttons nofilter}}
+			{{$like nofilter}}
+			{{$dislike nofilter}}
 		</div>
 		{{/if}}
 		<hr>
@@ -82,7 +82,7 @@
 
 	{{* Insert the comments *}}
 	<div id="photo-comment-wrapper-{{$id}}" class="photo-comment-wrapper">
-		{{$comments}}
+		{{$comments nofilter}}
 	</div>
 
 	{{$paginate nofilter}}
diff --git a/view/theme/quattro/templates/photo_view.tpl b/view/theme/quattro/templates/photo_view.tpl
index cd1a7ccc9..0b65c2c53 100644
--- a/view/theme/quattro/templates/photo_view.tpl
+++ b/view/theme/quattro/templates/photo_view.tpl
@@ -20,18 +20,18 @@
 {{/if}}
 {{if $tags.2}}<div id="tag-remove"><a href="{{$tags.2}}">{{$tags.3}}</a></div>{{/if}}
 
-{{if $edit}}{{$edit}}{{/if}}
+{{if $edit}}{{$edit nofilter}}{{/if}}
 
 {{if $likebuttons}}
 <div id="photo-like-div">
-	{{$likebuttons}}
-	{{$like}}
-	{{$dislike}}	
+	{{$likebuttons nofilter}}
+	{{$like nofilter}}
+	{{$dislike nofilter}}
 </div>
 {{/if}}
 
 <div class="wall-item-comment-wrapper photo">
-    {{$comments}}
+    {{$comments nofilter}}
 </div>
 
 {{$paginate nofilter}}
diff --git a/view/theme/vier/templates/photo_view.tpl b/view/theme/vier/templates/photo_view.tpl
index 21eda89b3..aa3f7aadd 100644
--- a/view/theme/vier/templates/photo_view.tpl
+++ b/view/theme/vier/templates/photo_view.tpl
@@ -22,18 +22,18 @@
 {{/if}}
 {{if $tags.2}}<div id="tag-remove"><a href="{{$tags.2}}">{{$tags.3}}</a></div>{{/if}}
 
-{{if $edit}}{{$edit}}{{/if}}
+{{if $edit}}{{$edit nofilter}}{{/if}}
 
 {{if $likebuttons}}
 <div id="photo-like-div">
-	{{$likebuttons}}
-	{{$like}}
-	{{$dislike}}	
+	{{$likebuttons nofilter}}
+	{{$like nofilter}}
+	{{$dislike nofilter}}
 </div>
 {{/if}}
 
 <div class="wall-item-comment-wrapper photo">
-{{$comments}}
+	{{$comments nofilter}}
 </div>
 
 {{$paginate nofilter}}

{{$product}}
+ + {{$product}} + +
{{$preamble nofilter}}
{{$preamble}}
	{{$source_name}}
	{{$title}}
	{{$htmlversion}}
{{$hsitelink}}
{{$hitemlink}}
	{{$thanks}}
	{{$site_admin}}
	{{$source_name}}
	{{$title}}
	{{$htmlversion nofilter}}
{{$hsitelink nofilter}}
{{$hitemlink nofilter}}
	{{$thanks}}
	{{$site_admin}}