diff --git a/server/theme/email_agenda.fr_ca.html b/server/theme/email_agenda.fr_ca.html
index e8d2be0..a9946a3 100644
--- a/server/theme/email_agenda.fr_ca.html
+++ b/server/theme/email_agenda.fr_ca.html
@@ -1,30 +1,33 @@
 <h1>{{ get_highlighted_field(item, ["headline", "name"]) | safe }}</h1>
-<a href="{{ url_for_agenda(item) }}"><b>Voir cet élément dans votre compte: </b>{{ url_for_agenda(item) }}<br></a>
 
-{%  if item.event %}<p class="h3"><b>Quand: </b>{{ dateString }}  {{get_event_state(item)}}</p>{% endif %}
+<b>Voir cet élément dans votre compte : </b><a href="{{ url_for_agenda(item) }}">{{ url_for_agenda(item) }}</a><br>
+
+{% if item.event %}
+    <p class="h3"><b>Quand : </b>{{ dateString }}  {{get_event_state(item)}}</p>
+{% endif %}
 
 {% if location and location != '' %}
-    <p class="h3"><b>Où:</b> {{ location }}</p>
+    <p class="h3"><b>Où : </b>{{ location }}</p>
 {% endif %}
 
 {% if map and map != '' %}
     <div><img style="height: auto!important; max-width: 700px!important; width: 100%!important"
-              src={{ map | safe }} ></div>
+              src={{ map | safe }}></div>
 {% endif %}
 
 {% if contacts | length is gt 0 %}
-    <p><b>Contact: </b>
+    <p><b>Contact : </b>
     {% for contact in contacts %}
         <div>{{ contact.name or contact.organisation }}
         {{ contact.phone }}
         {{ contact.mobile }}
         {{ contact.email }}</div>
     {% endfor %}
-    </p>
+    </p><br>
 {% endif %}
 
 {% if links | length is gt 1 %}
-    <p><b>Web: </b>
+    <p><b>Web : </b>
     {% for link in links %}
         <div><a href={{ link | safe }}>{{ link }}</a><br></div>
     {% endfor %}
@@ -32,26 +35,26 @@ <h1>{{ get_highlighted_field(item, ["headline", "name"]) | safe }}</h1>
 {% endif %}
 
 {% if item.definition_long or item.definition_short %}
-    <b>Description de l’événement: </b>
+    <b>Description de l’événement : </b>
     <p>
         {{ get_highlighted_field(item, ["definition_long", "definition_short"]) | safe }}
     </p>
 {% endif %}
 
-{%  for planning_item in item.get('planning_items', []) or [] %}
+{% for planning_item in item.get('planning_items', []) or [] %}
     <div>
         <div>
-            <h3>Élément de couverture:</h3>
+            <h3>Élément de couverture : </h3>
             {% if (planning_item.get('description_text') or planning_item.get('name') or '') != (item.definition_long or item.definition_short) %}
                 <p>
-                <b>Description de l’élément de planification: </b>{{ planning_item.get('description_text') or planning_item.get('name') or '' }}
+                <b>Description de l’élément de planification : </b>{{ planning_item.get('description_text') or planning_item.get('name') or '' }}
                 </p>
             {% endif %}
         </div>
 
         {% if planning_item.get('ednote') %}
             <div>
-                <strong>Note de la rédaction:</strong>
+                <strong>Note de la rédaction : </strong>
                 {{ planning_item.get('ednote') }}
             </div>
         {% endif %}
@@ -59,19 +62,20 @@ <h3>Élément de couverture:</h3>
         {% if planning_item.get('coverages', []) %}
             <p>
                 <div>
-                    <p><strong>Couverture:</strong></p>
+                    <p><strong>Couverture : </strong></p>
                 </div>
 
                 {% for cov in get_planning_coverages(item, planning_item._id) %}
                     <div>
-                        <p><b>Type de couverture: </b>{{get_coverage_content_type(cov,recipient_language)}}</p>
-                        <p><b>Statut de couverture: </b>{{get_coverage_status(cov)}}</p>
-                        <p><b>Date et heure d’échéance de la couverture: </b>{{get_coverage_date(cov)}}</p>
-                        <p><b>Affecté à: </b>
+                        <p><b>Type de couverture : </b>{{get_coverage_content_type(cov,recipient_language)}}</p>
+                        <p><b>Statut de couverture : </b>{{get_coverage_status(cov)}}</p>
+                        <p><b>Date et heure d’échéance de la couverture : </b>{{get_coverage_date(cov)}}</p>
+                        <p><b>Affectée à : </b>
                             {% if cov.get('assigned_desk_name') %}{{cov['assigned_desk_name']}}{% endif %}
-                            {% if cov.get('assigned_desk_email') %}<a href="mailto:{{cov['assigned_desk_email']}}?subject=Demande de couverture d’une utilisatrice de PC NouvellesPro: {{item.headline or item.name}}">{{cov['assigned_desk_email']}}</a>{% endif %}
+                            {% if cov.get('assigned_desk_email') %}<a href="mailto:{{cov['assigned_desk_email']}}?subject=Demande de couverture d’une utilisatrice de PC NouvellesPro : {{item.headline or item.name}}">{{cov['assigned_desk_email']}}</a>{% endif %}
+                            /
                             {% if cov.get('assigned_user_name') %}{{cov['assigned_user_name']}}{% endif %}
-                            {% if cov.get('assigned_user_email') %}<a href="mailto:{{cov['assigned_desk_email']}}?subject=Demande de couverture d’une utilisatrice de PC NouvellesPro: {{item.headline or item.name}}">{{cov['assigned_user_email']}}</a>{% endif %}
+                            {% if cov.get('assigned_user_email') %}<a href="mailto:{{cov['assigned_desk_email']}}?subject=Demande de couverture d’une utilisatrice de PC NouvellesPro : {{item.headline or item.name}}">{{cov['assigned_user_email']}}</a>{% endif %}
                         </p>
                     </div>
                 {% endfor %}
@@ -79,4 +83,4 @@ <h3>Élément de couverture:</h3>
         {% endif %}
     </div>
 {% endfor %}
-<div><b>Sujet enregistré: {{ topic_name }}</b></div>
\ No newline at end of file
+<div><b>Sujet enregistré : {{ topic_name }}</b></div>
\ No newline at end of file
diff --git a/server/theme/email_agenda.fr_ca.txt b/server/theme/email_agenda.fr_ca.txt
index 47c3c46..a36e714 100644
--- a/server/theme/email_agenda.fr_ca.txt
+++ b/server/theme/email_agenda.fr_ca.txt
@@ -1,32 +1,55 @@
 {{ item.headline or item.name }}
-Voir cet élément dans votre compte: {{ url_for_agenda(item) }}
-{%  if item.event %}Quand: {{ dateString }}  {{get_event_state(item)}}{% endif %}
-{% if location and location != '' %}Où: {{ location }}
-{% endif %}{% if contacts | length is gt 0 %}Contact: {% for contact in contacts %}{{ contact.name or contact.organisation }} {{ contact.phone }} {{ contact.mobile }} {{ contact.email }}
-{% endfor %}
-{% endif %}{% if links | length is gt 1 %}Web: {% for link in links %}{{ link }}
-{% endfor %}
+Voir cet élément dans votre compte : {{ url_for_agenda(item) }}
+{% if item.event %}
+    Quand : {{ dateString }}  {{get_event_state(item)}}
 {% endif %}
-{% if item.definition_long or item.definition_short %}Description de l’événement: {{ item.definition_long or item.definition_short }}
+
+{% if location and location != '' %}
+    Où : {{ location }}
 {% endif %}
-{%  for planning_item in item.get('planning_items', []) or [] %}
-Élément de couverture:
-{%- if (planning_item.get('description_text') or planning_item.get('name') or '') != (item.definition_long or item.definition_short) %}
-Description de l’élément de planification: {{ planning_item.get('description_text') or planning_item.get('name') or '' }}
-{% endif -%}
-{% if planning_item.get('ednote') %}Note de la rédaction: {{ planning_item.get('ednote') }}{% endif %}
-{% if planning_item.get('coverages', []) | length is gt 0 %}
-Couverture:
-{% for cov in get_planning_coverages(item, planning_item._id) %}
-Type de couverture: {{get_coverage_content_type(cov,recipient_language)}}
-Statut de couverture: {{get_coverage_status(cov)}}
-Date et heure d’échéance de la couverture: {{get_coverage_date(cov)}}
-Affecté à:
-{% if cov.get('assigned_desk_name')%}{{cov['assigned_desk_name']}}{% endif %}
-{% if cov.get('assigned_desk_email') %}{{cov['assigned_desk_email']}}{% endif %}
-{% if cov.get('assigned_user_name') %}{{cov['assigned_user_name']}}{% endif %}
-{% if cov.get('assigned_user_email') %}{{cov['assigned_user_email']}}{% endif %}
-{% endfor %}
+
+{% if contacts | length is gt 0 %}
+    Contact :
+    {% for contact in contacts %}
+        {{ contact.name or contact.organisation }} {{ contact.phone }} {{ contact.mobile }} {{ contact.email }}
+    {% endfor %}
+{% endif %}
+
+{% if links | length is gt 1 %}
+    Web :
+    {% for link in links %}
+        {{ link }}
+    {% endfor %}
+{% endif %}
+
+{% if item.definition_long or item.definition_short %}
+    Description de l’événement : {{ item.definition_long or item.definition_short }}
 {% endif %}
+
+{% for planning_item in item.get('planning_items', []) or [] %}
+    Élément de couverture :
+    {%- if (planning_item.get('description_text') or planning_item.get('name') or '') != (item.definition_long or item.definition_short) %}
+        Description de l’élément de planification : {{ planning_item.get('description_text') or planning_item.get('name') or '' }}
+    {% endif -%}
+
+    {% if planning_item.get('ednote') %}
+        Note de la rédaction : {{ planning_item.get('ednote') }}
+    {% endif %}
+
+    {% if planning_item.get('coverages', []) | length is gt 0 %}
+        Couverture :
+        {% for cov in get_planning_coverages(item, planning_item._id) %}
+            Type de couverture : {{ get_coverage_content_type(cov, recipient_language) }}
+            Statut de couverture : {{ get_coverage_status(cov) }}
+            Date et heure d’échéance de la couverture : {{ get_coverage_date(cov) }}
+            Affectée à :
+            {% if cov.get('assigned_desk_name') %}{{ cov['assigned_desk_name'] }}{% endif %}
+            {% if cov.get('assigned_desk_email') %}{{ cov['assigned_desk_email'] }}{% endif %}
+            /
+            {% if cov.get('assigned_user_name') %}{{ cov['assigned_user_name'] }}{% endif %}
+            {% if cov.get('assigned_user_email') %}{{ cov['assigned_user_email'] }}{% endif %}
+        {% endfor %}
+    {% endif %}
 {% endfor %}
-Sujet enregistré: {{ topic_name }}
\ No newline at end of file
+
+Sujet enregistré : {{ topic_name }}
diff --git a/server/theme/email_agenda.html b/server/theme/email_agenda.html
index cf78429..f9c79fd 100644
--- a/server/theme/email_agenda.html
+++ b/server/theme/email_agenda.html
@@ -1,29 +1,36 @@
 <h1>{{ get_highlighted_field(item, ["headline", "name"]) | safe }}</h1>
-<a href="{{ url_for_agenda(item) }}"><b>View this item in your account: </b>{{ url_for_agenda(item) }} <br></a>
-{%  if item.event %}<p class="h3"><b>When:</b>{{ dateString }}  {{get_event_state(item)}}</p>{% endif %}
+
+<b>View this item in your account : </b><a href="{{ url_for_agenda(item) }}">{{ url_for_agenda(item) }}</a><br>
+
+{% if item.event %}
+    <p class="h3"><b>When : </b>{{ dateString }} {{ get_event_state(item) }}</p>
+{% endif %}
 
 {% if location and location != '' %}
-    <p class="h3"><b>Where:</b> {{ location }}</p>
+    <p class="h3"><b>Where : </b>{{ location }}</p>
 {% endif %}
 
 {% if map and map != '' %}
-    <div><img style="height: auto!important; max-width: 700px!important; width: 100%!important"
-              src={{ map | safe }} ></div>
+    <div>
+        <img style="height: auto!important; max-width: 700px!important; width: 100%!important" src={{ map | safe }}>
+    </div>
 {% endif %}
 
 {% if contacts | length is gt 0 %}
-    <p><b>Contact: </b>
+    <p><b>Contact : </b>
     {% for contact in contacts %}
-        <div>{{ contact.name or contact.organisation }}
-        {{ contact.phone }}
-        {{ contact.mobile }}
-        {{ contact.email }}</div>
+        <div>
+            {{ contact.name or contact.organisation }}<br>
+            {{ contact.phone }}<br>
+            {{ contact.mobile }}<br>
+            {{ contact.email }}
+        </div>
     {% endfor %}
-    </p>
+    </p><br>
 {% endif %}
 
 {% if links | length is gt 1 %}
-    <p><b>Web: </b>
+    <p><b>Web : </b>
     {% for link in links %}
         <div><a href={{ link | safe }}>{{ link }}</a><br></div>
     {% endfor %}
@@ -31,47 +38,41 @@ <h1>{{ get_highlighted_field(item, ["headline", "name"]) | safe }}</h1>
 {% endif %}
 
 {% if item.definition_long or item.definition_short %}
-    <b>Event description: </b>
-    <p>
-        {{ get_highlighted_field(item, ["definition_long", "definition_short"]) | safe }}
-    </p>
+    <b>Event description : </b>
+    <p>{{ get_highlighted_field(item, ["definition_long", "definition_short"]) | safe }}</p>
 {% endif %}
 
-{%  for planning_item in item.get('planning_items', []) or [] %}
+{% for planning_item in item.get('planning_items', []) or [] %}
     <div>
-        <div>
-            <h3>Planning item:</h3>
-            {% if (planning_item.get('description_text') or planning_item.get('name') or '') != (item.definition_long or item.definition_short) %}
-                <p>
-                <b>Planning item description:</b> {{ planning_item.get('description_text') or planning_item.get('name') or '' }}
-                </p>
-            {%  endif %}
-        </div>
+        <h3>Planning item : </h3>
+        {% if (planning_item.get('description_text') or planning_item.get('name') or '') != (item.definition_long or item.definition_short) %}
+            <p><b>Planning item description : </b>{{ planning_item.get('description_text') or planning_item.get('name') or '' }}</p>
+        {% endif %}
 
         {% if planning_item.get('ednote') %}
             <div>
-                <strong>Editorial Note:</strong>
-                {{ planning_item.get('ednote') }}
+                <strong>Editorial Note : </strong>{{ planning_item.get('ednote') }}
             </div>
         {% endif %}
 
         {% if planning_item.get('coverages', []) %}
             <p>
                 <div>
-                    <p><strong>Coverage:</strong></p>
+                    <p><strong>Coverage : </strong></p>
                 </div>
 
                 {% for cov in get_planning_coverages(item, planning_item._id) %}
                     <div>
-                        <p><b>Type of coverage: </b>{{get_coverage_content_type(cov,recipient_language)}}</p>
-                        <p><b>Coverage status: </b>{{get_coverage_status(cov)}}</p>
-                        <p><b>Coverage due date & time: </b>{{get_coverage_date(cov)}}</p>
+                        <p><b>Type of coverage : </b>{{ get_coverage_content_type(cov, recipient_language) }}</p>
+                        <p><b>Coverage status : </b>{{ get_coverage_status(cov) }}</p>
+                        <p><b>Coverage due date & time : </b>{{ get_coverage_date(cov) }}</p>
                         {% if cov.get('assigned_desk_name') or cov.get('assigned_desk_email') or cov.get('assigned_user_name') or cov.get('assigned_user_email') %}
-                        <p><b>Assigned to:</b>
-                            {% if cov.get('assigned_desk_name') %}{{cov['assigned_desk_name']}}{% endif %}
-                            {% if cov.get('assigned_desk_email') %}<a href="mailto:{{cov['assigned_desk_email']}}?subject=Coverage inquiry from CP NewsPro user: {{item.headline or item.name}}">{{cov['assigned_desk_email']}}</a>{% endif %}
-                            {% if cov.get('assigned_user_name') %}{{cov['assigned_user_name']}}{% endif %}
-                            {% if cov.get('assigned_user_email') %}<a href="mailto:{{cov['assigned_desk_email']}}?subject=Coverage inquiry from CP NewsPro user: {{item.headline or item.name}}">{{cov['assigned_user_email']}}</a>{% endif %}
+                        <p><b>Assigned to : </b>
+                            {% if cov.get('assigned_desk_name') %}{{ cov['assigned_desk_name'] }}{% endif %}
+                            {% if cov.get('assigned_desk_email') %}<a href="mailto:{{ cov['assigned_desk_email'] }}?subject=Coverage inquiry from CP NewsPro user: {{ item.headline or item.name }}">{{ cov['assigned_desk_email'] }}</a>{% endif %}
+                            /
+                            {% if cov.get('assigned_user_name') %}{{ cov['assigned_user_name'] }}{% endif %}
+                            {% if cov.get('assigned_user_email') %}<a href="mailto:{{ cov['assigned_desk_email'] }}?subject=Coverage inquiry from CP NewsPro user: {{ item.headline or item.name }}">{{ cov['assigned_user_email'] }}</a>{% endif %}
                         </p>
                         {% endif %}
                     </div>
@@ -81,4 +82,4 @@ <h3>Planning item:</h3>
     </div>
 {% endfor %}
 
-<div><b>Saved topic: {{ topic_name }}</b></div>
\ No newline at end of file
+<div><b>Saved topic : {{ topic_name }}</b></div>
diff --git a/server/theme/email_agenda.txt b/server/theme/email_agenda.txt
index 470a55e..a7ed785 100644
--- a/server/theme/email_agenda.txt
+++ b/server/theme/email_agenda.txt
@@ -1,33 +1,57 @@
 {{ item.headline or item.name }}
-View this item in your account: {{ url_for_agenda(item) }}
-{% if item.event %}When: {{ dateString }}  {{get_event_state(item)}}{% endif %}
-{% if location and location != '' %}Where: {{ location }}{% endif %}
-{% if contacts | length is gt 0 %}Contact: {% for contact in contacts %}{{ contact.name or contact.organisation }} {{ contact.phone }} {{ contact.mobile }} {{ contact.email }}
-{% endfor %}
-{% endif %}{% if links | length is gt 1 %}Web: {% for link in links %}{{ link }}
-{% endfor %}
+
+View this item in your account : {{ url_for_agenda(item) }}
+
+{% if item.event %}
+    When : {{ dateString }}  {{ get_event_state(item) }}
 {% endif %}
-{% if item.definition_long or item.definition_short %}Event description: {{ item.definition_long or item.definition_short }}
+
+{% if location and location != '' %}
+    Where : {{ location }}
 {% endif %}
-{%  for planning_item in item.get('planning_items', []) or [] %}
-Planning Item:
-{%- if (planning_item.get('description_text') or planning_item.get('name') or '') != (item.definition_long or item.definition_short) %}
-Planning item description: {{ planning_item.get('description_text') or planning_item.get('name') or '' }}
-{% endif -%}
-{% if planning_item.get('ednote') %}Editorial Note: {{ planning_item.get('ednote') }}
-{% endif -%}
-{% if planning_item.get('coverages', []) | length is gt 0 %}
-Coverages:
-{% for cov in get_planning_coverages(item, planning_item._id) %}
-Type of coverage:{{get_coverage_content_type(cov,recipient_language)}}
-Coverage status: {{get_coverage_status(cov)}}
-Coverage due date & time: {{get_coverage_date(cov)}}
-Assigned to:
-{% if cov.get('assigned_desk_name') %}{{cov['assigned_desk_name']}}{% endif %}
-{% if cov.get('assigned_desk_email') %}{{cov['assigned_desk_email']}}{% endif %}
-{% if cov.get('assigned_user_name') %}{{cov['assigned_user_name']}}{% endif %}
-{% if cov.get('assigned_user_email') %}{{cov['assigned_user_email']}}{% endif %}
-{% endfor %}
+
+{% if contacts | length is gt 0 %}
+    Contact :
+    {% for contact in contacts %}
+        {{ contact.name or contact.organisation }} {{ contact.phone }} {{ contact.mobile }} {{ contact.email }}
+    {% endfor %}
+{% endif %}
+
+{% if links | length is gt 1 %}
+    Web :
+    {% for link in links %}
+        {{ link }}
+    {% endfor %}
+{% endif %}
+
+{% if item.definition_long or item.definition_short %}
+    Event description : {{ item.definition_long or item.definition_short }}
 {% endif %}
+
+{% for planning_item in item.get('planning_items', []) or [] %}
+    Planning Item :
+    {%- if (planning_item.get('description_text') or planning_item.get('name') or '') != (item.definition_long or item.definition_short) %}
+        Planning item description : {{ planning_item.get('description_text') or planning_item.get('name') or '' }}
+    {% endif -%}
+
+    {% if planning_item.get('ednote') %}
+        Editorial Note : {{ planning_item.get('ednote') }}
+    {% endif %}
+
+    {% if planning_item.get('coverages', []) | length is gt 0 %}
+        Coverages :
+        {% for cov in get_planning_coverages(item, planning_item._id) %}
+            Type of coverage : {{ get_coverage_content_type(cov, recipient_language) }}
+            Coverage status : {{ get_coverage_status(cov) }}
+            Coverage due date & time : {{ get_coverage_date(cov) }}
+            Assigned to :
+            {% if cov.get('assigned_desk_name') %}{{ cov['assigned_desk_name'] }}{% endif %}
+            {% if cov.get('assigned_desk_email') %}{{ cov['assigned_desk_email'] }}{% endif %}
+            /
+            {% if cov.get('assigned_user_name') %}{{ cov['assigned_user_name'] }}{% endif %}
+            {% if cov.get('assigned_user_email') %}{{ cov['assigned_user_email'] }}{% endif %}
+        {% endfor %}
+    {% endif %}
 {% endfor %}
-Saved topic: {{ topic_name }}
\ No newline at end of file
+
+Saved topic : {{ topic_name }}