Secure alternatives to email?

What current attempts are there to replace email with something secure rather than encryption slapped on after the fact like with email? Desirable properties would be like, for example, Google Wave had a federated model which thus allows you to run your own server which gets around the problem of the feds backdooring web based encrypted solutions like Lavabit.