message save function added
added deleted icon on message
index conflict fixed
Merge branch 'olein-master'