Fix for plain text longer than 15 characters + test