Added Basic Mail Storage Handler