Really fix the problem with the mail send to packages-removal twice:

We can't use the same subst template, as it (of course) isn't reset after
the first if block.  So we use a common Subst-dictionary and two individual
ones.