I tested a scenario where in one browser I uploaded a file and shared with User X. In a different browser, I then immediately started following User X as a different user. In the resulting email, I saw the uploaded file, followed by 2 instances of the follow activity.

![screen shot 2014-05-26 at 15 54 18](https://cloud.githubusercontent.com/assets/109850/3088075/e441007a-e567-11e3-95b5-e81a456ba278.png)