Fix for 1.5.5 to accomodate what seems to be a bugfix with missing email subjects