Apply patch to welcome-message-800 provided by Sandro Tosi: