Rubification; mailbox collection fix