Revert "Commented bookmarks code for 0.4.0 release"

This reverts commit 8306d4c24421993fc04837499e7682dad4948878.
Switch back to storage for muc bookmarks