changing default encrypt back to true
show pt button when can't encrypt for users
fixing merge conflict
moving login prompt to only appear when compose window added
actually fixing merge conflict
changing encryption tagline again