Added basic message fill
Added attachment fill