Removing dup code, merging changes with the refactor, fixing missing intent filter.
Mark message as seen on reply