Merge branch 'yuki2006-master'
Merge branch 'yuki2006-master'
No user session setting return the on_receive_clicked()
adjust on marge the pull request
saving other setting