Adam, can you have a look at the ticket below. I think there are some good trac improvements that are suggested and will improve the way RC evolves (and adds clarity and speed of return).

http://trac.roundcube.net/ticket/1484641

Seansan