Jonas: #27: 'message' improved