updated encrypt-sign-messages-inbox branch with diff from dead-sdrop-app branch