separated contacts and messages , bugs few fixes