merge #454 and personal folder and session encryption patch