[MERGE] Merged with addons/trunk, because of the mail_thread widget renaming.