fix bugs of the feedback in the mail
Merge remote-tracking branch 'origin/master'
fix bugs in the feedback in the email