Vehicular Ad-Hoc Network (VANET)s are a key element of Intelligent Transport System (ITS)s. One of the challenges in VANETs is dealing with awareness and congestion due to the high amount of messages received from the vehicles in communication range. As VANETs are used in critical applications, congestion on the receiver side caused by the buffering of the packets is a safety hazard. In this thesis, we propose a stream-wise queuing system on the receiver side and show how it improves the timeliness of the messages received and main- tains the awareness of the system in a congestion situation.