Merge "ehow folders in conversation list items if they exist in the layout."