removed dependency on iframes for messages and calendar