Added another mechanism for key retrieval
Cleaned up some unnecessary/unwanted/unused headers from encrypted message