From e5c25c395f2a12783b97caf30e7fd155d9475f4d Mon Sep 17 00:00:00 2001
From: Scott <romracer@gmail.com>
Date: Sat, 14 Apr 2018 16:47:41 -0500
Subject: [PATCH] Remove stale link to old auto-forward settings. Fixes #450

Also update a reference to 'smtp' to use HOST_AUTHSMTP
---
 core/admin/mailu/models.py                   | 2 +-
 core/admin/mailu/ui/templates/user/list.html | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/core/admin/mailu/models.py b/core/admin/mailu/models.py
index 48f7b91e..e439d997 100644
--- a/core/admin/mailu/models.py
+++ b/core/admin/mailu/models.py
@@ -162,7 +162,7 @@ class Email(object):
         """
         from_address = '{}@{}'.format(
             app.config['POSTMASTER'], app.config['DOMAIN'])
-        with smtplib.SMTP('smtp', port=10025) as smtp:
+        with smtplib.SMTP(app.config['HOST_AUTHSMTP'], port=10025) as smtp:
             msg = text.MIMEText(body)
             msg['Subject'] = subject
             msg['From'] = from_address
diff --git a/core/admin/mailu/ui/templates/user/list.html b/core/admin/mailu/ui/templates/user/list.html
index 7d908fe0..8d3a0304 100644
--- a/core/admin/mailu/ui/templates/user/list.html
+++ b/core/admin/mailu/ui/templates/user/list.html
@@ -32,7 +32,6 @@
   </td>
   <td>
     <a href="{{ url_for('.user_settings', user_email=user.email) }}" title="{% trans %}Settings{% endtrans %}"><i class="fa fa-wrench"></i></a>&nbsp;
-    <a href="{{ url_for('.user_forward', user_email=user.email) }}" title="{% trans %}Auto-forward{% endtrans %}"><i class="fa fa-share"></i></a>&nbsp;
     <a href="{{ url_for('.user_reply', user_email=user.email) }}" title="{% trans %}Auto-reply{% endtrans %}"><i class="fa fa-plane"></i></a>&nbsp;
     <a href="{{ url_for('.fetch_list', user_email=user.email) }}" title="{% trans %}Fetched accounts{% endtrans %}"><i class="fa fa-download"></i></a>&nbsp;
   </td>