Implement email expanding, task #510