fix auto-add of bookmarks to find sender correctly and optionally auto add bookmarks for self