move imports into header files
add note
fix conflict
add Mail object; remove activity spinner
fixes #63