More ThankYou Fun

The last patchset had people getting recurring messages in DE

Change-Id: I825c04c6cdfce6db6ccd509c2c0aef1acd3aa9c0
Fixing a small bug in ThankYou Gen

Change-Id: I4e1398cb233e289c01ea5dcd2a658fba62221984