Updated from upstream
imported usermsg-gui