Fixes when non-conversations got a border

Latest update added borders. We fixed it.