More work on the stream and inbox plugins