Merge pull request #32 from BrandyMint/aleksxor/various-fixes

mark_read refactor and sender.type recognition