diff --git a/greenmine/base/users/templates/emails/password_recovery-body-html.jinja b/greenmine/base/users/templates/emails/password_recovery-body-html.jinja
index 4c8b6696..7dcba518 100644
--- a/greenmine/base/users/templates/emails/password_recovery-body-html.jinja
+++ b/greenmine/base/users/templates/emails/password_recovery-body-html.jinja
@@ -1 +1,22 @@
-Password recovery token: {{ resolve_front_url('change-password', user.token) }}
+{% extends "emails/base.jinja" %}
+
+{% set final_url = resolve_front_url('change-password', user.token) %}
+
+{% block body %}
+<table border="0" width="100%" cellpadding="0" cellspacing="0" class="table-body">
+    <tr>
+        <td>
+            <h1>Recover your password:</h1>
+            <p>Hello {{ user.get_full_name() }},</p>
+            <p>you can recover your password by going to the following url:</p>
+            <p><a style="color: #666;" href="{{ final_url }}">{{ final_url }}</a>
+            <p>You can ignore this message if you did not request.</p>
+            <p>Regards</p>
+            <p>
+                --<br />
+                The Greenmine Team
+            </p>
+        </td>
+    </tr>
+</table>
+{% endblock %}
diff --git a/greenmine/base/users/templates/emails/password_recovery-body-text.jinja b/greenmine/base/users/templates/emails/password_recovery-body-text.jinja
new file mode 100644
index 00000000..b654c2db
--- /dev/null
+++ b/greenmine/base/users/templates/emails/password_recovery-body-text.jinja
@@ -0,0 +1,12 @@
+Hello {{ user.get_full_name() }},
+
+you can recover your password by going to the following url:
+
+{{ resolve_front_url('change-password', user.token) }}
+
+You can ignore this message if you did not request.
+
+Regards
+
+--
+The Greenmine Team
diff --git a/greenmine/base/users/templates/emails/password_recovery-subject.jinja b/greenmine/base/users/templates/emails/password_recovery-subject.jinja
index 713e0fec..df3033b0 100644
--- a/greenmine/base/users/templates/emails/password_recovery-subject.jinja
+++ b/greenmine/base/users/templates/emails/password_recovery-subject.jinja
@@ -1 +1 @@
-Password recovery
+[Greenmine] Password recovery