From 2b112b0d99bbc5ee2207a1af6fd545e8e1ac5222 Mon Sep 17 00:00:00 2001
From: Karel Picman <karel.picman@kontron.com>
Date: Wed, 2 Apr 2014 08:53:00 +0200
Subject: [PATCH] Email from value taken from the settings

---
 app/views/dmsf/email_entries.html.erb | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/views/dmsf/email_entries.html.erb b/app/views/dmsf/email_entries.html.erb
index f17464a1..6e65f357 100644
--- a/app/views/dmsf/email_entries.html.erb
+++ b/app/views/dmsf/email_entries.html.erb
@@ -1,7 +1,8 @@
 <%# Redmine plugin for Document Management System "Features"
 #
-# Copyright (C) 2011   Vít Jonáš <vit.jonas@gmail.com>
-# Copyright (C) 2012   Daniel Munn  <dan.munn@munnster.co.uk>
+# Copyright (C) 2011    Vít Jonáš <vit.jonas@gmail.com>
+# Copyright (C) 2012    Daniel Munn <dan.munn@munnster.co.uk>
+# Copyright (C) 2011-14 Karel Pičman <karel.picman@kontron.com>
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -34,7 +35,7 @@
   <div class="box">
     <p>
       <%= label_tag('', "#{l(:label_email_from)}:") %>
-      <i><%= h(User.current.mail) %></i>
+      <i><%= h(Setting.mail_from) %></i>
     </p>
     <p>
       <%= label_tag('email[to]', "#{l(:label_email_to)}:") %>