Added SA to level 345 & fixed envelope_sender in MS.conf
push from previous fixes