ensure short_message
is not empty + add extra fields
#233
+27
−6
short_message
is not empty + add extra fields
#233