Cleanup
Fixed recipient list bug