rename buffer
fixed
Oops
Merge branch 'master' into esmtp
modified