Some improvements for Weekmail