View sent messages feature
Fix merging conflicts