mail fix and "acted_at" error