Fixing yield condition and adding text email footer