Merge "Fix widget updating" into jb-ub-mail