diff --git a/MANIFEST.in b/MANIFEST.in
index 91d0edb2..74ea23b1 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,3 +1,3 @@
 include *.rst
-recursive-include ihatemoney *.rst *.py *.yaml *.po *.mo *.html *.css *.js *.eot *.svg *.woff *.txt *.png *.ini *.cfg
+recursive-include ihatemoney *.rst *.py *.yaml *.po *.mo *.html *.css *.js *.eot *.svg *.woff *.txt *.png *.ini *.cfg *.j2
 include LICENSE CONTRIBUTORS CHANGELOG.rst requirements.txt
diff --git a/ihatemoney/templates/invitation_mail.en b/ihatemoney/templates/invitation_mail.en.j2
similarity index 70%
rename from ihatemoney/templates/invitation_mail.en
rename to ihatemoney/templates/invitation_mail.en.j2
index eeaafdb9..42be0d25 100644
--- a/ihatemoney/templates/invitation_mail.en
+++ b/ihatemoney/templates/invitation_mail.en.j2
@@ -2,10 +2,10 @@ Hi,
 
 Someone using the email address {{ g.project.contact_email }} invited you to share your expenses for "{{ g.project.name }}".
 
-It's as simple as saying what did you paid for, for who, and how much did it cost you, we are caring about the rest.
+It's as simple as saying what did you pay for, for whom, and how much did it cost you, we are caring about the rest.
 
 You can log in using this link: {{ url_for(".authenticate", _external=True, token=g.project.generate_token()) }}.
-Once logged in you can use the following link which is easier to remember: {{ url_for(".list_bills", _external=True) }}
+Once logged-in, you can use the following link which is easier to remember: {{ url_for(".list_bills", _external=True) }}
 If your cookie gets deleted or if you log out, you will need to log back in using the first link.
 
 Enjoy,
diff --git a/ihatemoney/templates/invitation_mail.fr b/ihatemoney/templates/invitation_mail.fr.j2
similarity index 53%
rename from ihatemoney/templates/invitation_mail.fr
rename to ihatemoney/templates/invitation_mail.fr.j2
index a95f9e9e..197edcca 100644
--- a/ihatemoney/templates/invitation_mail.fr
+++ b/ihatemoney/templates/invitation_mail.fr.j2
@@ -1,11 +1,11 @@
 Salut,
 
-Quelqu'un avec l'addresse email "{{ g.project.contact_email }}" vous à invité à partager vos dépenses pour "{{ g.project.name }}".
+Quelqu'un avec l'adresse "{{ g.project.contact_email }}" vous à invité à partager vos dépenses pour "{{ g.project.name }}".
 
-C'est aussi simple que de dire qui à payé pour quoi, pour qui, et combien celà à coûté, on s'occuppe du reste.
+C'est aussi simple que de dire qui à payé pour quoi, pour qui, et combien celà à coûté, on s’occupe du reste.
 
 Vous pouvez vous authentifier avec le lien suivant: {{ url_for(".authenticate", _external=True, token=g.project.generate_token()) }}.
 Une fois authentifié, vous pouvez utiliser le lien suivant qui est plus facile à mémoriser: {{ url_for(".list_bills", _external=True) }}
-Si votre cookie est supprimé ou si vous vous déconnectez, voous devrez vous réauthentifier en utilisant le premier lien.
+Si votre cookie est supprimé ou si vous vous déconnectez, vous devrez vous authentifier à nouveau en utilisant le premier lien.
 
 Have fun,
diff --git a/ihatemoney/templates/password_reminder.en b/ihatemoney/templates/password_reminder.en.j2
similarity index 80%
rename from ihatemoney/templates/password_reminder.en
rename to ihatemoney/templates/password_reminder.en.j2
index bc7e609c..c6543546 100644
--- a/ihatemoney/templates/password_reminder.en
+++ b/ihatemoney/templates/password_reminder.en.j2
@@ -1,8 +1,8 @@
 Hi,
 
-You requested to reset the password of the following project: "{{ project.name }}". 
+You requested to reset the password of the following project: "{{ project.name }}".
 You can reset it here: {{ url_for(".reset_password", _external=True, token=project.generate_token(expiration=3600)) }}.
-This link is only valid for 1 hour.
+This link is only valid for one hour.
 
 Hope this helps,
 Some weird guys (with beards)
diff --git a/ihatemoney/templates/password_reminder.fr b/ihatemoney/templates/password_reminder.fr.j2
similarity index 100%
rename from ihatemoney/templates/password_reminder.fr
rename to ihatemoney/templates/password_reminder.fr.j2
diff --git a/ihatemoney/templates/reminder_mail.en b/ihatemoney/templates/reminder_mail.en.j2
similarity index 100%
rename from ihatemoney/templates/reminder_mail.en
rename to ihatemoney/templates/reminder_mail.en.j2
diff --git a/ihatemoney/templates/reminder_mail.fr b/ihatemoney/templates/reminder_mail.fr.j2
similarity index 100%
rename from ihatemoney/templates/reminder_mail.fr
rename to ihatemoney/templates/reminder_mail.fr.j2
diff --git a/ihatemoney/web.py b/ihatemoney/web.py
index e6df385a..6b1b3589 100644
--- a/ihatemoney/web.py
+++ b/ihatemoney/web.py
@@ -242,7 +242,7 @@ def create_project():
             message_title = _("You have just created '%(project)s' "
                               "to share your expenses", project=g.project.name)
 
-            message_body = render_template("reminder_mail.%s" %
+            message_body = render_template("reminder_mail.%s.j2" %
                                            get_locale().language)
 
             msg = Message(message_title,
@@ -273,7 +273,7 @@ def remind_password():
             project = Project.query.get(form.id.data)
 
             # send a link to reset the password
-            password_reminder = "password_reminder.%s" % get_locale().language
+            password_reminder = "password_reminder.%s.j2" % get_locale().language
             current_app.mail.send(Message(
                 "password recovery",
                 body=render_template(password_reminder, project=project),
@@ -395,7 +395,7 @@ def invite():
         if form.validate():
             # send the email
 
-            message_body = render_template("invitation_mail.%s" %
+            message_body = render_template("invitation_mail.%s.j2" %
                                            get_locale().language)
 
             message_title = _("You have been invited to share your "