diff --git a/serendipity_event_contactform/ChangeLog b/serendipity_event_contactform/ChangeLog
index e841a89d..2bd0a361 100644
--- a/serendipity_event_contactform/ChangeLog
+++ b/serendipity_event_contactform/ChangeLog
@@ -1,31 +1,40 @@
+1.17:
+-----
+ * Sets required version to S9y 1.3
+ * Set Sent Box to text, to not allow hidden <p> tags by WYSIWYG-Editors
+   for the text.
+ * Fixed Smarty template includement
+ * Removed unused and confusing code
+ * Fix german lang constant for "PLUGIN_CONTACTFORM_SENT_HTML"
+
 1.16:
 -----
 
-fix XSS security vulnerability (Thanks to Stefan Schurtz!)
+* fix XSS security vulnerability (Thanks to Stefan Schurtz!)
 
 1.15:
 -----
 
-latest: Smarty3 forward compatibility
+* latest: Smarty3 forward compatibility
 
 1.14:
 -----
 
-Added check to circument adduser plugin's "registered only" option.
+* Added check to circument adduser plugin's "registered only" option.
 
 1.13:
 -----
 
-Force spamblock plugin to properly realize "time to live" of captchas.
-Previously, even though captchas where displayed, it did not matter what
-the user entered.
+* Force spamblock plugin to properly realize "time to live" of captchas.
+  Previously, even though captchas where displayed, it did not matter what
+  the user entered.
 
 1.11:
 -----
 
-Fix XHTML validity of checked="checked"
+* Fix XHTML validity of checked="checked"
 
 1.10:
 -----
 
-Introdcuce new "issue counter".
\ No newline at end of file
+* Introdcuce new "issue counter".
\ No newline at end of file
diff --git a/serendipity_event_contactform/UTF-8/lang_bg.inc.php b/serendipity_event_contactform/UTF-8/lang_bg.inc.php
index ad2d138b..98717796 100644
--- a/serendipity_event_contactform/UTF-8/lang_bg.inc.php
+++ b/serendipity_event_contactform/UTF-8/lang_bg.inc.php
@@ -1,4 +1,4 @@
-<?php # 
+<?php
 
 /**
  *  @version 
@@ -21,18 +21,18 @@
 @define('PLUGIN_CONTACTFORM_DYNAMIC_ERROR_DATA', 'Не е попълнено задължително поле.');
 @define('PLUGIN_CONTACTFORM_ARTICLEFORMAT', 'Форматиране като статия ?');
 @define('PLUGIN_CONTACTFORM_ARTICLEFORMAT_BLAHBLAH', 'При избор \'Да\' съобщението се форматира автоматично като статия (цветове, шрифтове и т.н.).');
-@define('PLUGIN_CONTACTFORM_DYNAMICTPL','Use the dynamic tpl?');
-@define('PLUGIN_CONTACTFORM_DYNAMICTPL_DESC','This setting allows you to choose the form type you wish to use.  You can use the standard form, a small business form, a more detailed form or an entirely custom form created from a manually entered string.');
-@define('PLUGIN_CONTACTFORM_DYNAMICFIELDS','Form field string');
-@define('PLUGIN_CONTACTFORM_DYNAMICTPL_STANDARD','Standard');
-@define('PLUGIN_CONTACTFORM_DYNAMICTPL_SMALLBIZ','Small Business');
-@define('PLUGIN_CONTACTFORM_DYNAMICTPL_DETAILED','Detailed Form');
-@define('PLUGIN_CONTACTFORM_DYNAMICTPL_FULLDYNAMIC','Custom');
-@define('PLUGIN_CONTACTFORM_FNAME','First Name');
-@define('PLUGIN_CONTACTFORM_LNAME','Last Name');
-@define('PLUGIN_CONTACTFORM_ADDRESS','Address');
-@define('PLUGIN_CONTACTFORM_DYNAMICFIELDS_DESC','This is the string that is parsed to determine which fields will appear on the form, whether they are required, and the default settings.');
-@define('PLUGIN_CONTACTFORM_DYNAMICFIELDS_DESC_NOTE','<p>The "Form field string" is a text string that is used to determine which fields are displayed on the dynamic form.  The string must be in the order of &lt;field&gt;:&lt;field&gt;:&lt;field&gt;.  Note the separation by colons.</p>
+@define('PLUGIN_CONTACTFORM_DYNAMICTPL', 'Use the dynamic tpl?');
+@define('PLUGIN_CONTACTFORM_DYNAMICTPL_DESC', 'This setting allows you to choose the form type you wish to use.  You can use the standard form, a small business form, a more detailed form or an entirely custom form created from a manually entered string.');
+@define('PLUGIN_CONTACTFORM_DYNAMICFIELDS', 'Form field string');
+@define('PLUGIN_CONTACTFORM_DYNAMICTPL_STANDARD', 'Standard');
+@define('PLUGIN_CONTACTFORM_DYNAMICTPL_SMALLBIZ', 'Small Business');
+@define('PLUGIN_CONTACTFORM_DYNAMICTPL_DETAILED', 'Detailed Form');
+@define('PLUGIN_CONTACTFORM_DYNAMICTPL_FULLDYNAMIC', 'Custom');
+@define('PLUGIN_CONTACTFORM_FNAME', 'First Name');
+@define('PLUGIN_CONTACTFORM_LNAME', 'Last Name');
+@define('PLUGIN_CONTACTFORM_ADDRESS', 'Address');
+@define('PLUGIN_CONTACTFORM_DYNAMICFIELDS_DESC', 'This is the string that is parsed to determine which fields will appear on the form, whether they are required, and the default settings.');
+@define('PLUGIN_CONTACTFORM_DYNAMICFIELDS_DESC_NOTE', '<p>The "Form field string" is a text string that is used to determine which fields are displayed on the dynamic form.  The string must be in the order of &lt;field&gt;:&lt;field&gt;:&lt;field&gt;.  Note the separation by colons.</p>
    <p>The individual fields (except for type "radio", as defined later) must be of the form {require;}Name;type{;default}.  Note the separation by semicolons.  Also, note that the curly brackets indicate an optional field.  If a field must be filled in to complete the form then the word "require" must appear at the start of the field definition (without the curly backets).</p>
    <p>Fields of different types are available.  Currently these types are supported:
         <ul> 
@@ -57,4 +57,4 @@
          <li>The last four together:- "require;Phone number;text:Default text;textarea;This is default text.  It is boring.  But it is default.:Radio Button;radio;Yes,yes|No,no,checked:Check Box;checkbox;checked" </li>
        </ul>
    </p>');
-?>
+
diff --git a/serendipity_event_contactform/UTF-8/lang_cs.inc.php b/serendipity_event_contactform/UTF-8/lang_cs.inc.php
index 914df4d8..035f92c8 100644
--- a/serendipity_event_contactform/UTF-8/lang_cs.inc.php
+++ b/serendipity_event_contactform/UTF-8/lang_cs.inc.php
@@ -71,4 +71,5 @@
 // Next lines were translated on 2009/05/06
 @define('PLUGIN_CONTACTFORM_ISSUECOUNTER',		'Používat počítadlo kontaktních formulářů?');
 @define('PLUGIN_CONTACTFORM_ISSUECOUNTER_DESC',		'Pokud je použito, každý odeslaný kontaktní formulář dostane jedinečné ID identifikační číslo.');
-@define('PLUGIN_CONTACTFORM_MAIL_ISSUECOUNTER',		'Číslo lístku: %s');
\ No newline at end of file
+@define('PLUGIN_CONTACTFORM_MAIL_ISSUECOUNTER',		'Číslo lístku: %s');
+
diff --git a/serendipity_event_contactform/UTF-8/lang_cz.inc.php b/serendipity_event_contactform/UTF-8/lang_cz.inc.php
index 914df4d8..035f92c8 100644
--- a/serendipity_event_contactform/UTF-8/lang_cz.inc.php
+++ b/serendipity_event_contactform/UTF-8/lang_cz.inc.php
@@ -71,4 +71,5 @@
 // Next lines were translated on 2009/05/06
 @define('PLUGIN_CONTACTFORM_ISSUECOUNTER',		'Používat počítadlo kontaktních formulářů?');
 @define('PLUGIN_CONTACTFORM_ISSUECOUNTER_DESC',		'Pokud je použito, každý odeslaný kontaktní formulář dostane jedinečné ID identifikační číslo.');
-@define('PLUGIN_CONTACTFORM_MAIL_ISSUECOUNTER',		'Číslo lístku: %s');
\ No newline at end of file
+@define('PLUGIN_CONTACTFORM_MAIL_ISSUECOUNTER',		'Číslo lístku: %s');
+
diff --git a/serendipity_event_contactform/UTF-8/lang_de.inc.php b/serendipity_event_contactform/UTF-8/lang_de.inc.php
index c3892faa..22236f1c 100644
--- a/serendipity_event_contactform/UTF-8/lang_de.inc.php
+++ b/serendipity_event_contactform/UTF-8/lang_de.inc.php
@@ -9,7 +9,7 @@
 @define('PLUGIN_CONTACTFORM_INTRO', 'Einführungstext (optional)');
 @define('PLUGIN_CONTACTFORM_MESSAGE', 'Nachricht');
 @define('PLUGIN_CONTACTFORM_SENT', 'Dargestellter Text nach Übermittlung der Nachricht.');
-@define('PLUGIN_CONTACTFORM_SENT_HTML', 'Ihre Nachricht wurde erfolgreich verschickt!!');
+@define('PLUGIN_CONTACTFORM_SENT_HTML', 'Ihre Nachricht wurde erfolgreich verschickt');
 @define('PLUGIN_CONTACTFORM_ERROR_HTML', 'Ein Fehler trat bei der Übermittlung der E-Mail auf. Eventuell ist ihre E-Mail Adresse ungültig oder der Server ist spazieren gegangen.');
 @define('PLUGIN_CONTACTFORM_ERROR_DATA', 'Name, E-Mail und ihre Nachricht dürfen nicht leer gelassen werden.');
 @define('PLUGIN_CONTACTFORM_ARTICLEFORMAT', 'Als Artikel formatieren?');
@@ -19,18 +19,18 @@
 @define('PLUGIN_CONTACTFORM_TEMPLATE_DESC', 'Legt den Namen der Templatedatei fest, mit der das Kontaktformular dargestellt wird. Diese Datei kann entweder in dem Verzeichnis dieses Plugins oder dem Template-Verzeichnis gespeichert werden.');
 
 @define('PLUGIN_CONTACTFORM_DYNAMIC_ERROR_DATA', 'Ein benötigtes Feld wurde nicht ausgefüllt.');
-@define('PLUGIN_CONTACTFORM_DYNAMICTPL','Dynamische Vorlage (tpl) benutzen?');
-@define('PLUGIN_CONTACTFORM_DYNAMICTPL_DESC','erlaubt die Auswahl, welches Formular benutzt wird. Sie können zwischen dem Standard-Formular, einem Formular für kleine Geschäfte, einem detaillierten Formular und einem komplett selbsterstelltes Formular, das aus der manuell eingegebenen Zeichenkette erstellt wird, wählen.');
-@define('PLUGIN_CONTACTFORM_DYNAMICFIELDS','Formularfeld-Zeichenkette');
-@define('PLUGIN_CONTACTFORM_DYNAMICTPL_STANDARD','Standard');
-@define('PLUGIN_CONTACTFORM_DYNAMICTPL_SMALLBIZ','Kleines Geschäft');
-@define('PLUGIN_CONTACTFORM_DYNAMICTPL_DETAILED','Detailliertes Formular');
-@define('PLUGIN_CONTACTFORM_DYNAMICTPL_FULLDYNAMIC','Benutzerdefiniert');
-@define('PLUGIN_CONTACTFORM_FNAME','Vorname');
-@define('PLUGIN_CONTACTFORM_LNAME','Nachname');
-@define('PLUGIN_CONTACTFORM_ADDRESS','Adresse');
-@define('PLUGIN_CONTACTFORM_DYNAMICFIELDS_DESC','Dies ist die Zeichenkette, die festlegt, welche Felder im Formular angezeigt werden, ob sie erforderlich sind und was die Standardwerte sind.');
-@define('PLUGIN_CONTACTFORM_DYNAMICFIELDS_DESC_NOTE','<p>Die "Formularfeld-Zeichenkette" ist ein Text, der benutzt wird, um festzulegen, welche Felder im dynamischen Formular angezeigt werden. Die Zeichenkette muss folgendermaßen aussehen: &lt;Feld&gt;:&lt;Feld&gt;:&lt;Feld&gt;.  Beachten Sie die Trennung durch Doppelpunkte.</p>
+@define('PLUGIN_CONTACTFORM_DYNAMICTPL', 'Dynamische Vorlage (tpl) benutzen?');
+@define('PLUGIN_CONTACTFORM_DYNAMICTPL_DESC', 'erlaubt die Auswahl, welches Formular benutzt wird. Sie können zwischen dem Standard-Formular, einem Formular für kleine Geschäfte, einem detaillierten Formular und einem komplett selbsterstelltes Formular, das aus der manuell eingegebenen Zeichenkette erstellt wird, wählen.');
+@define('PLUGIN_CONTACTFORM_DYNAMICFIELDS', 'Formularfeld-Zeichenkette');
+@define('PLUGIN_CONTACTFORM_DYNAMICTPL_STANDARD', 'Standard');
+@define('PLUGIN_CONTACTFORM_DYNAMICTPL_SMALLBIZ', 'Kleines Geschäft');
+@define('PLUGIN_CONTACTFORM_DYNAMICTPL_DETAILED', 'Detailliertes Formular');
+@define('PLUGIN_CONTACTFORM_DYNAMICTPL_FULLDYNAMIC', 'Benutzerdefiniert');
+@define('PLUGIN_CONTACTFORM_FNAME', 'Vorname');
+@define('PLUGIN_CONTACTFORM_LNAME', 'Nachname');
+@define('PLUGIN_CONTACTFORM_ADDRESS', 'Adresse');
+@define('PLUGIN_CONTACTFORM_DYNAMICFIELDS_DESC', 'Dies ist die Zeichenkette, die festlegt, welche Felder im Formular angezeigt werden, ob sie erforderlich sind und was die Standardwerte sind.');
+@define('PLUGIN_CONTACTFORM_DYNAMICFIELDS_DESC_NOTE', '<p>Die "Formularfeld-Zeichenkette" ist ein Text, der benutzt wird, um festzulegen, welche Felder im dynamischen Formular angezeigt werden. Die Zeichenkette muss folgendermaßen aussehen: &lt;Feld&gt;:&lt;Feld&gt;:&lt;Feld&gt;.  Beachten Sie die Trennung durch Doppelpunkte.</p>
 <p>Die einzelnen Felder (mit Ausnahme des Typs "radio") müssen in der Form {require;}Name;type{;default} sein. Beachten Sie die Trennung durch Strichpunkte. Beachten Sie auch die geschweiften Klammern, die ein optionales Feld markieren. Wenn ein Feld zwingend ausgefüllt werden muss, muss das Wort "require" (ohne die geschweiften Klammern) am Anfang der Felddefinition stehen.</p>
 <p>Es sind mehrere verschiedene Feldtypen verfügbar. Momentan werden die folgenden Feldtypen unterstützt:
  <ul>
diff --git a/serendipity_event_contactform/UTF-8/lang_fr.inc.php b/serendipity_event_contactform/UTF-8/lang_fr.inc.php
index 8fd926ab..bd9ca8e0 100644
--- a/serendipity_event_contactform/UTF-8/lang_fr.inc.php
+++ b/serendipity_event_contactform/UTF-8/lang_fr.inc.php
@@ -1,4 +1,4 @@
-<?php # 
+<?php
 
 /**
  *  @version 
@@ -21,4 +21,3 @@
 @define('PLUGIN_CONTACTFORM_ARTICLEFORMAT', 'Formater comme un article ?');
 @define('PLUGIN_CONTACTFORM_ARTICLEFORMAT_BLAHBLAH', 'si oui, le texte est formaté comme un article (couleurs, bordures, etc.)');
 
-?>
diff --git a/serendipity_event_contactform/UTF-8/lang_ja.inc.php b/serendipity_event_contactform/UTF-8/lang_ja.inc.php
index 15cbdf25..db1c9cec 100644
--- a/serendipity_event_contactform/UTF-8/lang_ja.inc.php
+++ b/serendipity_event_contactform/UTF-8/lang_ja.inc.php
@@ -1,4 +1,4 @@
-<?php # 
+<?php
 
 /**
  *  @version 
@@ -21,4 +21,3 @@
 @define('PLUGIN_CONTACTFORM_ARTICLEFORMAT', '記事として清書しますか?');
 @define('PLUGIN_CONTACTFORM_ARTICLEFORMAT_BLAHBLAH', 'もし記事のように清書された書式(色・境界線など)で出力するなら「はい」を選びます (デフォルト: はい)');
 
-?>
diff --git a/serendipity_event_contactform/UTF-8/lang_nl.inc.php b/serendipity_event_contactform/UTF-8/lang_nl.inc.php
index 1884e544..746a6459 100644
--- a/serendipity_event_contactform/UTF-8/lang_nl.inc.php
+++ b/serendipity_event_contactform/UTF-8/lang_nl.inc.php
@@ -14,15 +14,15 @@
 @define('PLUGIN_CONTACTFORM_ERROR_DATA', 'Naam, e-mail en bericht mogen niet leeg zijn.');
 @define('PLUGIN_CONTACTFORM_DYNAMIC_ERROR_DATA', 'Niet alle verplichte velden zijn ingevuld.');
 @define('PLUGIN_CONTACTFORM_ARTICLEFORMAT', 'Opmaken als een inzending?');
-@define('PLUGIN_CONTACTFORM_FNAME','Voornaam');
-@define('PLUGIN_CONTACTFORM_LNAME','Achternaam');
-@define('PLUGIN_CONTACTFORM_ADDRESS','Adres');
+@define('PLUGIN_CONTACTFORM_FNAME', 'Voornaam');
+@define('PLUGIN_CONTACTFORM_LNAME', 'Achternaam');
+@define('PLUGIN_CONTACTFORM_ADDRESS', 'Adres');
 @define('PLUGIN_CONTACTFORM_ARTICLEFORMAT_BLAHBLAH', 'bij ja wordt de uitvoer automatisch opgemaakt als een inzending (kleuren, randen, etc.). Standaard: ja');
-@define('PLUGIN_CONTACTFORM_DYNAMICTPL','Dynamische tpl gebruiken?');
-@define('PLUGIN_CONTACTFORM_DYNAMICTPL_DESC','Met deze instelling kan een tpl-bestand gebruikt worden, om dynamische velden te maken in het formulier.');
-@define('PLUGIN_CONTACTFORM_DYNAMICFIELDS','Tekenreeks voor formulier-veld');
-@define('PLUGIN_CONTACTFORM_DYNAMICFIELDS_DESC','Dit is de tekenreeks die wordt toegepast om te bepalen welke velden zichtbaar zullen zijn op het formulier, of ze al dan niet verplicht zijn, en met welke standaardwaarden.');
-@define('PLUGIN_CONTACTFORM_DYNAMICFIELDS_DESC_NOTE','<p>De "Tekenreeks voor formulier-veld" wordt toegepast om te bepalen welke velden zichtbaar zullen zijn op het dynamische formulier. De tekenreeks moet worden opgemaakt als <field>:<field:<field>. Let op de scheiding door de dubbele punt.</p>
+@define('PLUGIN_CONTACTFORM_DYNAMICTPL', 'Dynamische tpl gebruiken?');
+@define('PLUGIN_CONTACTFORM_DYNAMICTPL_DESC', 'Met deze instelling kan een tpl-bestand gebruikt worden, om dynamische velden te maken in het formulier.');
+@define('PLUGIN_CONTACTFORM_DYNAMICFIELDS', 'Tekenreeks voor formulier-veld');
+@define('PLUGIN_CONTACTFORM_DYNAMICFIELDS_DESC', 'Dit is de tekenreeks die wordt toegepast om te bepalen welke velden zichtbaar zullen zijn op het formulier, of ze al dan niet verplicht zijn, en met welke standaardwaarden.');
+@define('PLUGIN_CONTACTFORM_DYNAMICFIELDS_DESC_NOTE', '<p>De "Tekenreeks voor formulier-veld" wordt toegepast om te bepalen welke velden zichtbaar zullen zijn op het dynamische formulier. De tekenreeks moet worden opgemaakt als <field>:<field:<field>. Let op de scheiding door de dubbele punt.</p>
    <p>De individuele velden (die van het type "radio", worden later gedefinieerd) moeten worden opgemaakt als {require;}Name;type{;default}. Let op de scheiding door de punt-komma. N.B.: de accolades geven een optioneel veld aan. Indien een veld verplicht is, dan moet het "require" gebruikt worden bij het veld (zonder accolades).</p>
    <p>Er zijn verschillende velden beschikbaar. Momenteel worden de volgende velden ondersteund:
         <ul> 
@@ -46,4 +46,5 @@
          <li>Een afvinkveld, standaard aangevinkt:- "Afvinkveld;checkbox;checked"</li>
          <li>Alle 4 velden samen:- "require;Telefoonnummer;text:Standaard tekst;textarea;Dit is een standaard tekst.  Saai?  Wat wil je, hij is standaard! :Opsommingsteken;radio;Ja,ja|Nee,nee,checked:Afvinkveld;checkbox;checked" </li>
        </ul>
-   </p>');
\ No newline at end of file
+   </p>');
+
diff --git a/serendipity_event_contactform/UTF-8/lang_pl.inc.php b/serendipity_event_contactform/UTF-8/lang_pl.inc.php
index d52137d1..65a0bf17 100644
--- a/serendipity_event_contactform/UTF-8/lang_pl.inc.php
+++ b/serendipity_event_contactform/UTF-8/lang_pl.inc.php
@@ -1,4 +1,4 @@
-<?php # 
+<?php
 
 /**
  *  @version 
@@ -21,4 +21,3 @@
 @define('PLUGIN_CONTACTFORM_ARTICLEFORMAT', 'Formatować jak artykuł?');
 @define('PLUGIN_CONTACTFORM_ARTICLEFORMAT_BLAHBLAH', 'Jeśli tak, strona z formularzem będzie formatowana i wyświetlana jak strona z wpisem i będą stosowane wszystkie formatowania (kolory, obramowania itp.) (Standardowo: Tak)');
 
-?>
diff --git a/serendipity_event_contactform/UTF-8/lang_tr.inc.php b/serendipity_event_contactform/UTF-8/lang_tr.inc.php
index 846f8efa..c90e2368 100644
--- a/serendipity_event_contactform/UTF-8/lang_tr.inc.php
+++ b/serendipity_event_contactform/UTF-8/lang_tr.inc.php
@@ -1,4 +1,4 @@
-<?php # 
+<?php
 
 /**
  *  @version 
@@ -21,4 +21,3 @@
 @define('PLUGIN_CONTACTFORM_ARTICLEFORMAT', 'Makale olarak biçimlensin mi?');
 @define('PLUGIN_CONTACTFORM_ARTICLEFORMAT_BLAHBLAH', 'Eğer evet seçeneği işaretlenirse çıktı makale olarak biçimlenecek (renkler, kenarlıklar, vb.) (öntanımlı: evet)');
 
-?>
diff --git a/serendipity_event_contactform/lang_bg.inc.php b/serendipity_event_contactform/lang_bg.inc.php
index 72fe16fb..2966983d 100644
--- a/serendipity_event_contactform/lang_bg.inc.php
+++ b/serendipity_event_contactform/lang_bg.inc.php
@@ -1,4 +1,4 @@
-<?php # 
+<?php
 
 /**
  *  @version 
@@ -57,4 +57,4 @@
          <li>The last four together:- "require;Phone number;text:Default text;textarea;This is default text.  It is boring.  But it is default.:Radio Button;radio;Yes,yes|No,no,checked:Check Box;checkbox;checked" </li>
        </ul>
    </p>');
-?>
+
diff --git a/serendipity_event_contactform/lang_cs.inc.php b/serendipity_event_contactform/lang_cs.inc.php
index 5d504c87..87fe63a3 100644
--- a/serendipity_event_contactform/lang_cs.inc.php
+++ b/serendipity_event_contactform/lang_cs.inc.php
@@ -71,4 +71,5 @@
 // Next lines were translated on 2009/05/06
 @define('PLUGIN_CONTACTFORM_ISSUECOUNTER',		'Pou��vat po��tadlo kontaktn�ch formul���?');
 @define('PLUGIN_CONTACTFORM_ISSUECOUNTER_DESC',		'Pokud je pou�ito, ka�d� odeslan� kontaktn� formul�� dostane jedine�n� ID identifika�n� ��slo.');
-@define('PLUGIN_CONTACTFORM_MAIL_ISSUECOUNTER',		'��slo l�stku: %s');
\ No newline at end of file
+@define('PLUGIN_CONTACTFORM_MAIL_ISSUECOUNTER',		'��slo l�stku: %s');
+
diff --git a/serendipity_event_contactform/lang_cz.inc.php b/serendipity_event_contactform/lang_cz.inc.php
index 3afca914..fd302772 100644
--- a/serendipity_event_contactform/lang_cz.inc.php
+++ b/serendipity_event_contactform/lang_cz.inc.php
@@ -71,4 +71,5 @@
 // Next lines were translated on 2009/05/06
 @define('PLUGIN_CONTACTFORM_ISSUECOUNTER',		'Pou��vat po��tadlo kontaktn�ch formul���?');
 @define('PLUGIN_CONTACTFORM_ISSUECOUNTER_DESC',		'Pokud je pou�ito, ka�d� odeslan� kontaktn� formul�� dostane jedine�n� ID identifika�n� ��slo.');
-@define('PLUGIN_CONTACTFORM_MAIL_ISSUECOUNTER',		'��slo l�stku: %s');
\ No newline at end of file
+@define('PLUGIN_CONTACTFORM_MAIL_ISSUECOUNTER',		'��slo l�stku: %s');
+
diff --git a/serendipity_event_contactform/lang_de.inc.php b/serendipity_event_contactform/lang_de.inc.php
index 8ea8b175..c1966f79 100644
--- a/serendipity_event_contactform/lang_de.inc.php
+++ b/serendipity_event_contactform/lang_de.inc.php
@@ -9,7 +9,7 @@
 @define('PLUGIN_CONTACTFORM_INTRO', 'Einf�hrungstext (optional)');
 @define('PLUGIN_CONTACTFORM_MESSAGE', 'Nachricht');
 @define('PLUGIN_CONTACTFORM_SENT', 'Dargestellter Text nach �bermittlung der Nachricht.');
-@define('PLUGIN_CONTACTFORM_SENT_HTML', 'Ihre Nachricht wurde erfolgreich verschickt!!');
+@define('PLUGIN_CONTACTFORM_SENT_HTML', 'Ihre Nachricht wurde erfolgreich verschickt!');
 @define('PLUGIN_CONTACTFORM_ERROR_HTML', 'Ein Fehler trat bei der �bermittlung der E-Mail auf. Eventuell ist ihre E-Mail Adresse ung�ltig oder der Server ist spazieren gegangen.');
 @define('PLUGIN_CONTACTFORM_ERROR_DATA', 'Name, E-Mail und ihre Nachricht d�rfen nicht leer gelassen werden.');
 @define('PLUGIN_CONTACTFORM_ARTICLEFORMAT', 'Als Artikel formatieren?');
@@ -19,18 +19,18 @@
 @define('PLUGIN_CONTACTFORM_TEMPLATE_DESC', 'Legt den Namen der Templatedatei fest, mit der das Kontaktformular dargestellt wird. Diese Datei kann entweder in dem Verzeichnis dieses Plugins oder dem Template-Verzeichnis gespeichert werden.');
 
 @define('PLUGIN_CONTACTFORM_DYNAMIC_ERROR_DATA', 'Ein ben�tigtes Feld wurde nicht ausgef�llt.');
-@define('PLUGIN_CONTACTFORM_DYNAMICTPL','Dynamische Vorlage (tpl) benutzen?');
-@define('PLUGIN_CONTACTFORM_DYNAMICTPL_DESC','erlaubt die Auswahl, welches Formular benutzt wird. Sie k�nnen zwischen dem Standard-Formular, einem Formular f�r kleine Gesch�fte, einem detaillierten Formular und einem komplett selbsterstelltes Formular, das aus der manuell eingegebenen Zeichenkette erstellt wird, w�hlen.');
-@define('PLUGIN_CONTACTFORM_DYNAMICFIELDS','Formularfeld-Zeichenkette');
-@define('PLUGIN_CONTACTFORM_DYNAMICTPL_STANDARD','Standard');
-@define('PLUGIN_CONTACTFORM_DYNAMICTPL_SMALLBIZ','Kleines Gesch�ft');
-@define('PLUGIN_CONTACTFORM_DYNAMICTPL_DETAILED','Detailliertes Formular');
-@define('PLUGIN_CONTACTFORM_DYNAMICTPL_FULLDYNAMIC','Benutzerdefiniert');
-@define('PLUGIN_CONTACTFORM_FNAME','Vorname');
-@define('PLUGIN_CONTACTFORM_LNAME','Nachname');
-@define('PLUGIN_CONTACTFORM_ADDRESS','Adresse');
-@define('PLUGIN_CONTACTFORM_DYNAMICFIELDS_DESC','Dies ist die Zeichenkette, die festlegt, welche Felder im Formular angezeigt werden, ob sie erforderlich sind und was die Standardwerte sind.');
-@define('PLUGIN_CONTACTFORM_DYNAMICFIELDS_DESC_NOTE','<p>Die "Formularfeld-Zeichenkette" ist ein Text, der benutzt wird, um festzulegen, welche Felder im dynamischen Formular angezeigt werden. Die Zeichenkette muss folgenderma�en aussehen: &lt;Feld&gt;:&lt;Feld&gt;:&lt;Feld&gt;.  Beachten Sie die Trennung durch Doppelpunkte.</p>
+@define('PLUGIN_CONTACTFORM_DYNAMICTPL', 'Dynamische Vorlage (tpl) benutzen?');
+@define('PLUGIN_CONTACTFORM_DYNAMICTPL_DESC', 'erlaubt die Auswahl, welches Formular benutzt wird. Sie k�nnen zwischen dem Standard-Formular, einem Formular f�r kleine Gesch�fte, einem detaillierten Formular und einem komplett selbsterstelltes Formular, das aus der manuell eingegebenen Zeichenkette erstellt wird, w�hlen.');
+@define('PLUGIN_CONTACTFORM_DYNAMICFIELDS', 'Formularfeld-Zeichenkette');
+@define('PLUGIN_CONTACTFORM_DYNAMICTPL_STANDARD', 'Standard');
+@define('PLUGIN_CONTACTFORM_DYNAMICTPL_SMALLBIZ', 'Kleines Gesch�ft');
+@define('PLUGIN_CONTACTFORM_DYNAMICTPL_DETAILED', 'Detailliertes Formular');
+@define('PLUGIN_CONTACTFORM_DYNAMICTPL_FULLDYNAMIC', 'Benutzerdefiniert');
+@define('PLUGIN_CONTACTFORM_FNAME', 'Vorname');
+@define('PLUGIN_CONTACTFORM_LNAME', 'Nachname');
+@define('PLUGIN_CONTACTFORM_ADDRESS', 'Adresse');
+@define('PLUGIN_CONTACTFORM_DYNAMICFIELDS_DESC', 'Dies ist die Zeichenkette, die festlegt, welche Felder im Formular angezeigt werden, ob sie erforderlich sind und was die Standardwerte sind.');
+@define('PLUGIN_CONTACTFORM_DYNAMICFIELDS_DESC_NOTE', '<p>Die "Formularfeld-Zeichenkette" ist ein Text, der benutzt wird, um festzulegen, welche Felder im dynamischen Formular angezeigt werden. Die Zeichenkette muss folgenderma�en aussehen: &lt;Feld&gt;:&lt;Feld&gt;:&lt;Feld&gt;.  Beachten Sie die Trennung durch Doppelpunkte.</p>
 <p>Die einzelnen Felder (mit Ausnahme des Typs "radio") m�ssen in der Form {require;}Name;type{;default} sein. Beachten Sie die Trennung durch Strichpunkte. Beachten Sie auch die geschweiften Klammern, die ein optionales Feld markieren. Wenn ein Feld zwingend ausgef�llt werden muss, muss das Wort "require" (ohne die geschweiften Klammern) am Anfang der Felddefinition stehen.</p>
 <p>Es sind mehrere verschiedene Feldtypen verf�gbar. Momentan werden die folgenden Feldtypen unterst�tzt:
  <ul>
diff --git a/serendipity_event_contactform/lang_fr.inc.php b/serendipity_event_contactform/lang_fr.inc.php
index c94d7ed2..06b56f8a 100644
--- a/serendipity_event_contactform/lang_fr.inc.php
+++ b/serendipity_event_contactform/lang_fr.inc.php
@@ -1,4 +1,4 @@
-<?php # 
+<?php
 
 /**
  *  @version 
@@ -21,4 +21,3 @@
 @define('PLUGIN_CONTACTFORM_ARTICLEFORMAT', 'Formater comme un article ?');
 @define('PLUGIN_CONTACTFORM_ARTICLEFORMAT_BLAHBLAH', 'si oui, le texte est format� comme un article (couleurs, bordures, etc.)');
 
-?>
diff --git a/serendipity_event_contactform/lang_ja.inc.php b/serendipity_event_contactform/lang_ja.inc.php
index 15cbdf25..db1c9cec 100644
--- a/serendipity_event_contactform/lang_ja.inc.php
+++ b/serendipity_event_contactform/lang_ja.inc.php
@@ -1,4 +1,4 @@
-<?php # 
+<?php
 
 /**
  *  @version 
@@ -21,4 +21,3 @@
 @define('PLUGIN_CONTACTFORM_ARTICLEFORMAT', '記事として清書しますか?');
 @define('PLUGIN_CONTACTFORM_ARTICLEFORMAT_BLAHBLAH', 'もし記事のように清書された書式(色・境界線など)で出力するなら「はい」を選びます (デフォルト: はい)');
 
-?>
diff --git a/serendipity_event_contactform/lang_nl.inc.php b/serendipity_event_contactform/lang_nl.inc.php
index 1f0a2a7b..8c7347fe 100644
--- a/serendipity_event_contactform/lang_nl.inc.php
+++ b/serendipity_event_contactform/lang_nl.inc.php
@@ -1,4 +1,4 @@
-<?php # 
+<?php
 
 /**
  *  @version 
@@ -20,14 +20,14 @@
 @define('PLUGIN_CONTACTFORM_DYNAMIC_ERROR_DATA', 'Niet alle verplichte velden zijn ingevuld.');
 @define('PLUGIN_CONTACTFORM_ARTICLEFORMAT', 'Opmaken als een inzending?');
 @define('PLUGIN_CONTACTFORM_ARTICLEFORMAT_BLAHBLAH', 'bij ja wordt de uitvoer automatisch opgemaakt als een inzending (kleuren, randen, etc.). Standaard: ja');
-@define('PLUGIN_CONTACTFORM_DYNAMICTPL','Dynamische tpl gebruiken?');
-@define('PLUGIN_CONTACTFORM_DYNAMICTPL_DESC','Met deze instelling kan een tpl-bestand gebruikt worden, om dynamische velden te maken in het formulier.');
-@define('PLUGIN_CONTACTFORM_DYNAMICFIELDS','Tekenreeks voor formulier-veld');
-@define('PLUGIN_CONTACTFORM_FNAME','Voornaam');
-@define('PLUGIN_CONTACTFORM_LNAME','Achternaam');
-@define('PLUGIN_CONTACTFORM_ADDRESS','Adres');
-@define('PLUGIN_CONTACTFORM_DYNAMICFIELDS_DESC','Dit is de tekenreeks die wordt toegepast om te bepalen welke velden zichtbaar zullen zijn op het formulier, of ze al dan niet verplicht zijn, en met welke standaardwaarden.');
-@define('PLUGIN_CONTACTFORM_DYNAMICFIELDS_DESC_NOTE','<p>De "Tekenreeks voor formulier-veld" wordt toegepast om te bepalen welke velden zichtbaar zullen zijn op het dynamische formulier. De tekenreeks moet worden opgemaakt als <field>:<field:<field>. Let op de scheiding door de dubbele punt.</p>
+@define('PLUGIN_CONTACTFORM_DYNAMICTPL', 'Dynamische tpl gebruiken?');
+@define('PLUGIN_CONTACTFORM_DYNAMICTPL_DESC', 'Met deze instelling kan een tpl-bestand gebruikt worden, om dynamische velden te maken in het formulier.');
+@define('PLUGIN_CONTACTFORM_DYNAMICFIELDS', 'Tekenreeks voor formulier-veld');
+@define('PLUGIN_CONTACTFORM_FNAME', 'Voornaam');
+@define('PLUGIN_CONTACTFORM_LNAME', 'Achternaam');
+@define('PLUGIN_CONTACTFORM_ADDRESS', 'Adres');
+@define('PLUGIN_CONTACTFORM_DYNAMICFIELDS_DESC', 'Dit is de tekenreeks die wordt toegepast om te bepalen welke velden zichtbaar zullen zijn op het formulier, of ze al dan niet verplicht zijn, en met welke standaardwaarden.');
+@define('PLUGIN_CONTACTFORM_DYNAMICFIELDS_DESC_NOTE', '<p>De "Tekenreeks voor formulier-veld" wordt toegepast om te bepalen welke velden zichtbaar zullen zijn op het dynamische formulier. De tekenreeks moet worden opgemaakt als <field>:<field:<field>. Let op de scheiding door de dubbele punt.</p>
    <p>De individuele velden (die van het type "radio", worden later gedefinieerd) moeten worden opgemaakt als {require;}Name;type{;default}. Let op de scheiding door de punt-komma. N.B.: de accolades geven een optioneel veld aan. Indien een veld verplicht is, dan moet het "require" gebruikt worden bij het veld (zonder accolades).</p>
    <p>Er zijn verschillende velden beschikbaar. Momenteel worden de volgende velden ondersteund:
         <ul> 
@@ -52,4 +52,4 @@
          <li>Alle 4 velden samen:- "require;Telefoonnummer;text:Standaard tekst;textarea;Dit is een standaard tekst.  Saai?  Wat wil je, hij is standaard! :Opsommingsteken;radio;Ja,ja|Nee,nee,checked:Afvinkveld;checkbox;checked" </li>
        </ul>
    </p>');
-?>
+
diff --git a/serendipity_event_contactform/lang_pl.inc.php b/serendipity_event_contactform/lang_pl.inc.php
index d373eaf5..d5f532dd 100644
--- a/serendipity_event_contactform/lang_pl.inc.php
+++ b/serendipity_event_contactform/lang_pl.inc.php
@@ -1,4 +1,4 @@
-<?php # 
+<?php
 
 /**
  *  @version 
@@ -21,4 +21,3 @@
 @define('PLUGIN_CONTACTFORM_ARTICLEFORMAT', 'Formatowa� jak artyku�?');
 @define('PLUGIN_CONTACTFORM_ARTICLEFORMAT_BLAHBLAH', 'Je�li tak, strona z formularzem b�dzie formatowana i wy�wietlana jak strona z wpisem i b�d� stosowane wszystkie formatowania (kolory, obramowania itp.) (Standardowo: Tak)');
 
-?>
diff --git a/serendipity_event_contactform/lang_tr.inc.php b/serendipity_event_contactform/lang_tr.inc.php
index 3c030011..56e804a7 100644
--- a/serendipity_event_contactform/lang_tr.inc.php
+++ b/serendipity_event_contactform/lang_tr.inc.php
@@ -1,4 +1,4 @@
-<?php # 
+<?php
 
 /**
  *  @version 
@@ -21,4 +21,3 @@
 @define('PLUGIN_CONTACTFORM_ARTICLEFORMAT', 'Makale olarak bi�imlensin mi?');
 @define('PLUGIN_CONTACTFORM_ARTICLEFORMAT_BLAHBLAH', 'E�er evet se�ene�i i�aretlenirse ��kt� makale olarak bi�imlenecek (renkler, kenarl�klar, vb.) (�ntan�ml�: evet)');
 
-?>
diff --git a/serendipity_event_contactform/plugin_contactform.tpl b/serendipity_event_contactform/plugin_contactform.tpl
index 0f3d25e5..5a0edc39 100644
--- a/serendipity_event_contactform/plugin_contactform.tpl
+++ b/serendipity_event_contactform/plugin_contactform.tpl
@@ -2,9 +2,9 @@
 <div class="serendipity_Entry_Date">
     <h3 class="serendipity_date">{$plugin_contactform_name}</h3>
 {/if}
-    
+
 <h4 class="serendipity_title"><a href="#">{$plugin_contactform_pagetitle}</a></h4>
-            
+
 {if $plugin_contactform_articleformat}
 <div class="serendipity_entry"><div class="serendipity_entry_body">
 {/if}
diff --git a/serendipity_event_contactform/plugin_dynamicform.tpl b/serendipity_event_contactform/plugin_dynamicform.tpl
index 690dc882..04e159df 100644
--- a/serendipity_event_contactform/plugin_dynamicform.tpl
+++ b/serendipity_event_contactform/plugin_dynamicform.tpl
@@ -2,9 +2,9 @@
 <div class="serendipity_Entry_Date">
     <h3 class="serendipity_date">{$plugin_contactform_name}</h3>
 {/if}
-    
+
 <h4 class="serendipity_title"><a href="#">{$plugin_contactform_pagetitle}</a></h4>
-            
+
 {if $plugin_contactform_articleformat}
 <div class="serendipity_entry"><div class="serendipity_entry_body">
 {/if}
diff --git a/serendipity_event_contactform/serendipity_event_contactform.php b/serendipity_event_contactform/serendipity_event_contactform.php
index a24fd7a2..79b2ac8e 100644
--- a/serendipity_event_contactform/serendipity_event_contactform.php
+++ b/serendipity_event_contactform/serendipity_event_contactform.php
@@ -1,6 +1,5 @@
 <?php
 
-
 if (IN_serendipity !== true) {
     die ("Don't hack!");
 }
@@ -28,11 +27,11 @@ class serendipity_event_contactform extends serendipity_event {
         $propbag->add('name', PLUGIN_CONTACTFORM_TITLE);
         $propbag->add('description', $desc);
         $propbag->add('event_hooks',  array('entries_header' => true, 'entry_display' => true, 'genpage' => true));
-        $propbag->add('configuration', array('permalink', 'pagetitle', 'backend_title', 'email', 'subject', 'counter', 'intro', 'sent', 'articleformat','dynamic_tpl','dynamic_fields','dynamic_fields_tpl','dynamic_fields_desc'));
+        $propbag->add('configuration', array('permalink', 'pagetitle', 'backend_title', 'email', 'subject', 'counter', 'intro', 'sent', 'articleformat', 'dynamic_tpl', 'dynamic_fields', 'dynamic_fields_tpl', 'dynamic_fields_desc'));
         $propbag->add('author', 'Garvin Hicking');
-        $propbag->add('version', '1.16.1');
+        $propbag->add('version', '1.17');
         $propbag->add('requirements',  array(
-            'serendipity' => '0.7',
+            'serendipity' => '1.3',
             'smarty'      => '2.6.7',
             'php'         => '4.1.0'
         ));
@@ -90,7 +89,7 @@ class serendipity_event_contactform extends serendipity_event {
                 break;
 
             case 'sent':
-                $propbag->add('type',        'html');
+                $propbag->add('type',        'text');
                 $propbag->add('name',        PLUGIN_CONTACTFORM_SENT);
                 $propbag->add('description', '');
                 $propbag->add('default',     PLUGIN_CONTACTFORM_SENT_HTML);
@@ -124,7 +123,7 @@ class serendipity_event_contactform extends serendipity_event {
                 break;
 
             case 'dynamic_fields':
-                if ($this->get_config('dynamic_tpl','standard') == 'full_dynamic') {
+                if ($this->get_config('dynamic_tpl', 'standard') == 'full_dynamic') {
                     $propbag->add('type',        'text');
                     $propbag->add('name',        PLUGIN_CONTACTFORM_DYNAMICFIELDS);
                     $propbag->add('description', PLUGIN_CONTACTFORM_DYNAMICFIELDS_DESC);
@@ -366,7 +365,7 @@ class serendipity_event_contactform extends serendipity_event {
 
         if ($this->selected()) {
             $form_fields = array();
-            $dynamic_tpl = $this->get_config('dynamic_tpl','standard');
+            $dynamic_tpl = $this->get_config('dynamic_tpl', 'standard');
             if (!headers_sent()) {
                 header('HTTP/1.0 200');
                 header('Status: 200 OK');
@@ -427,9 +426,10 @@ class serendipity_event_contactform extends serendipity_event {
                     'commentform_dynamicfields'  => $form_fields
                 )
             );
+
             if ($dynamic_tpl == 'standard') {
                 $tfile = serendipity_getTemplateFile('plugin_contactform.tpl', 'serendipityPath');
-                if (!$tfile) {
+                if (!$tfile || $tfile == 'plugin_contactform.tpl') {
                     $tfile = dirname(__FILE__) . '/plugin_contactform.tpl';
                 }
             } else {
@@ -439,22 +439,11 @@ class serendipity_event_contactform extends serendipity_event {
                 }
                 $tfile = serendipity_getTemplateFile($filename, 'serendipityPath');
 
-                if (!$tfile) {
+                if (!$tfile || $tfile == $filename) {
                     $tfile = dirname(__FILE__) . '/' . $filename;
                 }
             }
-            $inclusion = $serendipity['smarty']->security_settings[INCLUDE_ANY];
-            $serendipity['smarty']->security_settings[INCLUDE_ANY] = true;
-            $content = $serendipity['smarty']->fetch('file:'. $tfile);
-            $serendipity['smarty']->security_settings[INCLUDE_ANY] = $inclusion;
-
-            if ($this->get_config('markup') == TRUE) {
-                $entry = array('body' => $content);
-                serendipity_plugin_api::hook_event('frontend_display', $entry);
-                echo $entry['body'];
-            } else {
-                echo $content;
-            }
+            echo $this->parseTemplate($tfile);
         }
     }
 
@@ -499,7 +488,7 @@ class serendipity_event_contactform extends serendipity_event {
                         $serendipity['head_title']    = $this->get_config('pagetitle');
                         $serendipity['head_subtitle'] = (function_exists('serendipity_specialchars') ? serendipity_specialchars($serendipity['blogTitle']) : htmlspecialchars($serendipity['blogTitle'], ENT_COMPAT, LANG_CHARSET));
                     } else {
-                        // Put subpage back so static page plugin will work
+                        // Put subpage back so staticpage plugin will work
                         $serendipity['GET']['subpage'] = $oldsubpage;
                     }
                     break;
@@ -512,11 +501,6 @@ class serendipity_event_contactform extends serendipity_event {
                             $eventData = array('clean_page' => true);
                         }
                     }
-
-                    if (version_compare($serendipity['version'], '0.7.1', '<=')) {
-                        $this->show();
-                    }
-
                     return true;
                     break;