From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Tue, 11 Jul 2017 06:31:39 +0000 (+0200)
Subject: Merge pull request #3577 from annando/2in1
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=81dedb3f9208e9489a545cf5ed32363c007bd773;p=friendica.git

Merge pull request #3577 from annando/2in1

Issue 3571 and Diaspora mail bugfix
---

81dedb3f9208e9489a545cf5ed32363c007bd773