[m-rev.] for test and review by Peter: fix mantis 391

[Zoltan Somogyi]

On Sun, 16 Aug 2015 04:24:19 +1000 (AEST), "Zoltan Somogyi" <zoltan.somogyi at runbox.com> wrote:
> Come to think of it, we may already have code to do the former.
> I haven't checked, but if we do, then the attached diff should at least
> partially fix the problem.

Peter, can you please check whether this fixes your original problem?
If yes, please mark the mantis bug closed, preferably after adding
a test case. If not, please tell where the remaining problems are,
again preferably adding a test case for them.

Zoltan.