> Unfortunately, I also don't have time to spare for work that isn't directly related to the Messages up (until after sprint 6).

That's fine. I know @oconnore has been thinking about doing this work as part of his patch for [Bug 898354 - [User Story] Timer Notification](https://bugzilla.mozilla.org/show_bug.cgi?id=898354). What I'll do is mark this bug as blocked by that one, so you'll be notified when the refactoring is ready.