Fix file join to get right message buffer.
b=16658
i=tom.wang
i=adilger (oleg.drokin original patch)