New version with mail subjects and a new modal window