Update the messages if null
Update the messages if null

Still not working properly though

zubairq/AppShare,zubairq/gosharedata,zubairq/yazz,zubairq/AppShare,zubairq/gosharedata,zubairq/AppShare,zubairq/AppShare,zubairq/yazz