fix callback in sent
Merge pull request #114 from matiu/feature/ux12

fix callback in sent
fix conflict