Extended fix of bug 1033621, user email now appended to start of comment