Merge pull request #84 from FloArt/master

Fix forward of messages
modoboa · Jul 21, 2017 · 19608e8 · 19608e8
2 parents d3f66cb + c16b00e
commit 19608e8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/modoboa_webmail/forms.py b/modoboa_webmail/forms.py
@@ -241,7 +241,7 @@ def _build_msg(self, request):
         mbox = request.GET.get("mbox", None)
         mailid = request.GET.get("mailid", None)
         msg = super(ForwardMailForm, self)._build_msg(request)
-        origmsg = ImapEmail(request, False, "%s:%s" % (mbox, mailid))
+        origmsg = ImapEmail(request, "%s:%s" % (mbox, mailid))
         if origmsg.attachments:
             for attpart, fname in origmsg.attachments.items():
                 attdef, payload = origmsg.fetch_attachment(attpart)

diff --git a/modoboa_webmail/views.py b/modoboa_webmail/views.py
@@ -513,7 +513,7 @@ def forward(request):
     mbox, mailid = get_mail_info(request)
     if request.method == "POST":
         url = "?action=forward&mbox=%s&mailid=%s" % (mbox, mailid)
-        form = ForwardMailForm(request.POST)
+        form = ForwardMailForm(request.user, request.POST)
         status, resp = send_mail(request, form, url)
         if status:
             get_imapconnector(request).msg_forwarded(mbox, mailid)