Merge branch 'sb/merge-recursive-copy-paste-fix'

diff --git a/imap-send.c b/imap-send.c
index f33e56dba1e06cd61448069e3d300e3650477320..70bcc7a4e533bb04e8c515e8831a75ec93d2d066 100644 (file)
--- a/imap-send.c
+++ b/imap-send.c
@@ -919,7 +919,7 @@ static struct imap_store *imap_open_store(struct imap_server_conf *srvc, char *f
 
        ctx = xcalloc(1, sizeof(*ctx));
 
-       ctx->imap = imap = xcalloc(sizeof(*imap), 1);
+       ctx->imap = imap = xcalloc(1, sizeof(*imap));
        imap->buf.sock.fd[0] = imap->buf.sock.fd[1] = -1;
        imap->in_progress_append = &imap->in_progress;