fix for email sending
pagination fix