Extra defense against infinite loops
Continue retrieving items in a loop as long as we haven't reached the maximum.
Merge branch 'master' of github.com:mexon/friendica-addons

Conflicts:
	mailstream/mailstream.php