From 214b81991e39cee213b376df16fa06eeb5be0a83 Mon Sep 17 00:00:00 2001
From: Robert Sparks <rjsparks@nostrum.com>
Date: Tue, 9 Feb 2016 19:56:26 +0000
Subject: [PATCH] Further tweaks to rendering messages from the messaging
 framework. Commit ready for merge.  - Legacy-Id: 10809

---
 ietf/templates/base.html | 2 +-
 ietf/utils/mail.py       | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/ietf/templates/base.html b/ietf/templates/base.html
index 06d64f685..00170bdfe 100644
--- a/ietf/templates/base.html
+++ b/ietf/templates/base.html
@@ -88,7 +88,7 @@
         {% for message in messages %}
             <div class="alert{% if message.level_tag %} alert-{% if message.level_tag == 'error' %}danger{% else %}{{ message.level_tag }}{% endif %}{% endif %}{% if message.extra_tags %} {{message.extra_tags}}{% endif %} alert-dismissable">
                 <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&#215;</button>
-                {{ message|safe }}
+                {{ message }}
             </div>
         {% endfor %}
         {% if request.COOKIES.left_menu != "off" and not hide_menu %} {# ugly hack for the more or less unported meeting agenda edit pages #}
diff --git a/ietf/utils/mail.py b/ietf/utils/mail.py
index ac3c92e22..deeaa67e2 100644
--- a/ietf/utils/mail.py
+++ b/ietf/utils/mail.py
@@ -14,7 +14,6 @@ from django.contrib import messages
 from django.core.exceptions import ImproperlyConfigured
 from django.template.loader import render_to_string
 from django.template import Context,RequestContext
-from django.template.defaultfilters import escape as html_escape
 import ietf
 from ietf.utils.log import log
 import sys
@@ -241,7 +240,7 @@ def show_that_mail_was_sent(request,leadline,msg,bcc):
                     info += "Cc: %s\n" % msg.get('Cc')
                 if bcc:
                     info += "Bcc: %s\n" % bcc
-                messages.info(request,html_escape(info),extra_tags='preformatted',fail_silently=True)
+                messages.info(request,info,extra_tags='preformatted',fail_silently=True)
 
 def send_mail_mime(request, to, frm, subject, msg, cc=None, extra=None, toUser=False, bcc=None):
     """Send MIME message with content already filled in."""