Adding flowed text support for emails
After merge