diff --git a/app/views/devise/sessions/new.html.haml b/app/views/devise/sessions/new.html.haml
index 48479ba1..70de0e71 100644
--- a/app/views/devise/sessions/new.html.haml
+++ b/app/views/devise/sessions/new.html.haml
@@ -16,4 +16,4 @@
 
   .actions= f.submit t('.sign_in')
 
-= render "devise/shared/links"
+= render 'devise/shared/links'
diff --git a/app/views/events/show.html.haml b/app/views/events/show.html.haml
index 80d8b135..3dab63cc 100644
--- a/app/views/events/show.html.haml
+++ b/app/views/events/show.html.haml
@@ -8,7 +8,7 @@
             = link_to lug.name, lug.url
             (#{lug.department})
 
-    %h1 Actions
+    %h1=t '.actions'
     = link_to t('.add_to_calendar'), root_url
 
 %h2
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 0b7c298b..a2f68382 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -46,15 +46,15 @@
             =t '.france'
         %li
           = link_to 'http://www.agendadulibre.qc.ca' do
-            = image_tag 'france.png', alt: "#{t '.flag' } #{t '.quebec'}"
+            = image_tag 'quebec.png', alt: "#{t '.flag' } #{t '.quebec'}"
             =t '.quebec'
         %li
           = link_to 'http://www.agendadulibre.be' do
-            = image_tag 'france.png', alt: "#{t '.flag' } #{t '.belgique'}"
+            = image_tag 'belgique.png', alt: "#{t '.flag' } #{t '.belgique'}"
             =t '.belgique'
         %li
           = link_to 'http://www.agendadulibre.ch' do
-            = image_tag 'france.png', alt: "#{t '.flag' } #{t '.suisse'}"
+            = image_tag 'suisse.png', alt: "#{t '.flag' } #{t '.suisse'}"
             =t '.suisse'
 
     = render 'layouts/flash', flash: flash if flash.present?
diff --git a/app/views/notes/_form.html.haml b/app/views/notes/_form.html.haml
index cee45c48..d65db50c 100644
--- a/app/views/notes/_form.html.haml
+++ b/app/views/notes/_form.html.haml
@@ -1,14 +1,33 @@
 = form_for [:moderation, @note] do |f|
-  = hidden_field_tag :envoiParMail, params[:envoiParMail]
   - if @note.errors.any?
     #error_explanation
       %h2= "#{pluralize(@note.errors.count, "error")} prohibited this note from being saved:"
       %ul
         - @note.errors.full_messages.each do |msg|
           %li= msg
+
+  - if params[:envoiParMail]
+    = hidden_field_tag :envoiParMail, params[:envoiParMail]
+
+    %h2=t '.title'
+    %p=t 'title', scope: [:note_mailer, :create]
+    %p=t 'body', scope: [:note_mailer, :create], subject: @note.event.title, contents: @note.contents
+
   .field
     %p.label= f.label Note.human_attribute_name :contents
     = f.text_area :contents, cols: 70, rows: 10
 
-  .actions
-    = f.submit t('save')
+  - if params[:envoiParMail]
+    :markdown
+      #{t 'edit_link', scope: [:note_mailer, :create]}
+
+      #{ edit_moderation_url @note.event}
+
+      #{t 'signature', scope: [:note_mailer, :create]}
+
+    .actions
+      = f.submit t('.save')
+
+  - else
+    .actions
+      = f.submit t('save')
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 0a75940a..d05648c7 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -121,6 +121,7 @@ fr:
       dateAndPlace: Date et lieu
       description: Description
       infos: Informations
+      actions: Actions
     new:
       title: Soumettre un évènement
     create:
@@ -189,6 +190,9 @@ fr:
       title: Ajout d'une note de modération
     create:
       ok: La note a bien été ajoutée, merci!
+    form:
+      title: Rédaction du message
+      save: Envoyer
   maps:
     index:
       title: Carte des évènements