diff --git a/html/fun_subject.html b/html/fun_subject.html
index 030577b..375349b 100755
--- a/html/fun_subject.html
+++ b/html/fun_subject.html
@@ -4,18 +4,18 @@
 
 
 <form id="additem" method="post" action="[doc_base_url][dir][if-one item_is][item_url]/[end]subject">
-<fieldset>
-	<legend>{subject_form_legend}</legend>
 	
-	<p class="withnext" style="text-indent: 0;">{title}</p>
-	<input class="edit" type="text" name="subject" value="[if-one item_is][item_subject][else][dir_last_subject][end]">
+	<div class="winix_input_a">
+	<label>{title}</label>
+	<input type="text" name="subject" value="[if-one item_is][item_subject][else][dir_last_subject][end]">
+	</div>
 
 	[if winix_function_param_is "postredirect"]
 		<input type="hidden" name="postredirect" value="[winix_function_param_value "postredirect"]">
 	[end]
 	
 	<input class="submit" type="submit" value="{change}">
-</fieldset>
+
 </form>
 
 
diff --git a/locale/en b/locale/en
index 070a94b..43f30e7 100755
--- a/locale/en
+++ b/locale/en
@@ -446,7 +446,7 @@ stat_template_from_mount_point = from the mount point
 
 
 subject_header = Edit subject
-subject_form_legend = Edit subject form
+
 
 
 uname_header = Uname
diff --git a/locale/pl b/locale/pl
index 1b861d8..064670a 100755
--- a/locale/pl
+++ b/locale/pl
@@ -465,7 +465,7 @@ stat_template_from_mount_point = z punktu montowania
 
 
 subject_header = Zmień tytuł
-subject_form_legend = Formularz zmiany tytułu
+
 
 uname_header = Nazwa systemu
 uname_available_plugins = Dostępne pluginy
diff --git a/templates/filters.cpp b/templates/filters.cpp
index 13c5a1e..d9579c5 100755
--- a/templates/filters.cpp
+++ b/templates/filters.cpp
@@ -154,6 +154,47 @@ void fil_new_line_to_br(Info & i)
 
 
 
+/*
+ *  "  -> &#quot;
+ *  '  -> &#39; (&apos; but IE8 has a problem with &apos;)
+ */
+void fil_html_quote(Info & i)
+{
+	const std::wstring & str = i.in.Str();
+
+	for(size_t a=0 ; a<str.size() ; ++a)
+	{
+		if( str[a] == '\"' )
+			i.out << R("&quot;");
+		else
+		if( str[a] == '\'' )
+			i.out << R("&#39;");
+		else
+			i.out << R(str[a]);
+	}
+}
+
+
+/*
+ *  10 -> &#10;
+ *  13 -> &#13;
+ */
+void fil_html_newline(Info & i)
+{
+	const std::wstring & str = i.in.Str();
+
+	for(size_t a=0 ; a<str.size() ; ++a)
+	{
+		if( str[a] == 10 )
+			i.out << R("&#10;");
+		else
+		if( str[a] == 13 )
+			i.out << R("&#13;");
+		else
+			i.out << R(str[a]);
+	}
+}
+
 
 
 } // namespace
diff --git a/templates/htmltextstream.cpp b/templates/htmltextstream.cpp
index 6513c96..c4833cb 100755
--- a/templates/htmltextstream.cpp
+++ b/templates/htmltextstream.cpp
@@ -248,6 +248,18 @@ HtmlTextStream & HtmlTextStream::ETextPutChar(wchar_t c)
 	if( c == '&' )
 		buffer += L"&amp;";
 	else
+	if( c == '\"' )
+		buffer += L"&quot;";
+	else
+	if( c == '\'' )
+		buffer += L"&#39;"; // (it is "&apos;" but IE8 has a problem with &apos;)
+	else
+	if( c == 10 )
+		buffer += L"&#10;";
+	else
+	if( c == 13 )
+		buffer += L"&#13;";
+	else
 	if( c != 0 )
 		buffer += c;
 
diff --git a/templates/htmltextstream.h b/templates/htmltextstream.h
index a3f76df..929d41c 100755
--- a/templates/htmltextstream.h
+++ b/templates/htmltextstream.h
@@ -43,6 +43,10 @@ namespace Winix
 	 <  -> &lt;
 	 >  -> &gt;
 	 &  -> &nbsp;
+	 "  -> &quot;
+	 '  -> &#39; (it is "&apos;" but IE8 has a problem with &apos;)
+	 10 -> &#10;
+	 13 -> &#13;
 */
 class HtmlTextStream : public TextStream<std::wstring>
 {
diff --git a/templates/templates.cpp b/templates/templates.cpp
index 5aba314..69cca1d 100755
--- a/templates/templates.cpp
+++ b/templates/templates.cpp
@@ -279,6 +279,8 @@ void Templates::CreateFunctions()
 	ezc_functions.Insert("fil_first_wordup",         fil_first_wordup);
 	ezc_functions.Insert("fil_csv_escape",           fil_csv_escape);
 	ezc_functions.Insert("fil_new_line_to_br",       fil_new_line_to_br);
+	ezc_functions.Insert("fil_html_quote",           fil_html_quote);
+	ezc_functions.Insert("fil_html_newline",         fil_html_newline);
 
 
 	/*
diff --git a/templates/templates.h b/templates/templates.h
index 598b337..6d0726d 100755
--- a/templates/templates.h
+++ b/templates/templates.h
@@ -191,6 +191,8 @@ namespace TemplatesFunctions
 	void fil_first_wordup(Info & i);
 	void fil_csv_escape(Info & i);
 	void fil_new_line_to_br(Info & i);
+	void fil_html_quote(Info & i);
+	void fil_html_newline(Info & i);
 
 
 	/*