Merge "Fix signature delimiter for e-mail messages"