Index: WAeUP_SRP/trunk/skins/waeup_default/error_other.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_default/error_other.pt	(revision 1217)
+++ WAeUP_SRP/trunk/skins/waeup_default/error_other.pt	(revision 1218)
@@ -5,5 +5,8 @@
   <h3>WAeUP encountered an error</h3>
 
-  <p>We apologize for the incovenience.</p>
+  <p>We apologize for the incovenience. Please send a detailed error report using the mail address below. </p>
+
+  <p>The email will be directly send to our software developers in Germany. 
+     You will be notified by email when the problem is solved.</p>
 
   <dl>
@@ -17,7 +20,7 @@
       <img tal:replace="structure python:here.getImgTag('email.png',width=16,height=16)" />
        <a href="mailto:admin@here.com"
-         tal:attributes="href string:mailto:${p_props/email_from_address}?Subject=[CPS Error];
-                         title p_props/email_from_address"
-         i18n:translate="link_contact_admin">Contact the administrator</a>.
+         tal:attributes="href string:mailto:henrik@waeup.org?Subject=Portal Error;
+                         title string:Portal Administrator">
+         Contact the Portal Administrator</a>.
     </dt>
     <dd></dd>
Index: WAeUP_SRP/trunk/skins/waeup_student/student_view.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/student_view.pt	(revision 1217)
+++ WAeUP_SRP/trunk/skins/waeup_student/student_view.pt	(revision 1218)
@@ -1,8 +1,8 @@
-<metal:html tal:define="info context/getStudentFolderInfo;
+<metal:body use-macro="here/main_template/macros/master">
+    <metal:main fill-slot="main" 
+           tal:define="info context/getStudentFolderInfo;
                 is_so info/is_sectionofficer|nothing;
                 is_staff info/is_staff|nothing;
                 is_student info/is_student">
-  <metal:body use-macro="here/main_template/macros/master">
-    <metal:main fill-slot="main">
       <span tal:condition="not: info">
         <span tal:content="here/illegal_view" />
@@ -81,4 +81,3 @@
       </span>
     </metal:main>
-  </metal:body>
-</metal:html>
+</metal:body>
