Message and Announcement works in different way and they are queried also in different way.
So you will have to change so many filters to works it properly. Also some information for messages and announcement is different in database.
It will not be small amount code which i can provide you.