bugfix with component broker on mail