--- a/templates/sat_website/thank_you.html	Sun May 10 15:48:04 2015 +0200
+++ b/templates/sat_website/thank_you.html	Thu May 14 22:46:57 2015 +0200
@@ -27,21 +27,15 @@
 {% block headline %}{% trans "Thank you!" %}{% endblock %}
 {% block main_container %}
 
-<p>{% trans "Your subscription has been registered." %}</p>
-<div class="form-group">
-    {% for label, value in form.results %}
-        <div>{{ label }}: {{ value }}</div>
-    {% endfor %}
+<div class="alert alert-info" role="alert">
+    {% trans "Below a copy of the email we just sent to you." %}
+    {% if form.subscription_amount.value != "0" %}
+        {% trans "Please read it carefully, it contains the information to complete your subscription." %}
+    {% endif %}
 </div>
 
-<div class="alert alert-info" role="alert">
-{% if form.subscription_amount.value != "0" %}
-	{% blocktrans with amount=form.subscription_amount.value method=form.payment_method|selected_label|lower %}
-	You chose to pay your annual subscription of {{ amount }} € via {{ method }}.<br/>You should receive in a couple of minutes an email from us containing all the details to proceed with the payment.
-	{% endblocktrans %}
-{% else %}
-    {% blocktrans %}You should receive in a couple of minutes a confirmation email from us.{% endblocktrans %}
-{% endif %}
+<div class="container">
+    {{ form.prepareResultForUser|urlize|linebreaks }}
 </div>
 
 {% endblock %}