Use our db as buffer; fix share messages