Change "boundary" to be less likely to cause e-mail conflicts (bug #1602)