Merge branch 'tizen' into tizen_3.0

Change-Id: I5093f58a47ea7d87734ad8f1103951b9d83bef89
Signed-off-by: Andriy Kolesnichenko <a.kolesniche@samsung.com>

diff --cc common/inc/email-utils.h
Simple merge

diff --cc common/src/email-engine.c
Simple merge

diff --cc edc/mailbox/email-mailbox-theme.edc
Simple merge

diff --cc modules/composer/src/email-composer-attachment-ui.c
Simple merge

diff --cc modules/mailbox/src/email-mailbox.c
Simple merge