Fix #22: File caption message enhancements