From: markus schnalke <meillo@marmaro.de>
Date: Wed, 28 Oct 2015 18:02:13 +0000 (+0100)
Subject: Merge
X-Git-Tag: mmh-0.2~13
X-Git-Url: http://git.marmaro.de/?p=mmh;a=commitdiff_plain;h=776e627ad8aaa4d75bf1f7db04142a0f3bdf80ad;hp=5faf465b84082afa8bb85ce6fe87ce6675749675

Merge
---

diff --git a/sbr/addrsbr.c b/sbr/addrsbr.c
index 8915798..201e816 100644
--- a/sbr/addrsbr.c
+++ b/sbr/addrsbr.c
@@ -252,10 +252,10 @@ ismymbox(struct mailname *np)
 	if (am == NULL) {
 		mq.m_next = NULL;
 		mq.m_mbox = getusername();
+		mp = &mq;
 		if ((am = context_find("alternate-mailboxes")) == NULL) {
 			am = getusername();
 		} else {
-			mp = &mq;
 			oops = 0;
 			while ((cp = getname(am))) {
 				if ((mp->m_next = getm(cp, NULL, 0, AD_NAME, NULL)) == NULL) {