More Edit Account tweaks / OTR fixes / Bugfixes
csi feature added