Refactoring on favorites. Order-method sendmail and remove some unneeded
variables
Fix Sorting
Merge remote-tracking branch 'origin/DDBNEXT-722-a' into develop