timeline fix + environment debug fix + mail layouts
Merge remote-tracking branch 'origin/master'