Bugfix in mailout