preview media before sending them and allow sharing and attaching of multiple files

88 files changed, 84 insertions, 9 deletions

diff --git a/src/main/res/drawable-hdpi/ic_android_black_48dp.png b/src/main/res/drawable-hdpi/ic_android_black_48dp.png
new file mode 100644
index 000000000..38f6c05e8
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_android_black_48dp.png
diff --git a/src/main/res/drawable-hdpi/ic_android_white_48dp.png b/src/main/res/drawable-hdpi/ic_android_white_48dp.png
new file mode 100644
index 000000000..13108b25b
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_android_white_48dp.png
diff --git a/src/main/res/drawable-hdpi/ic_archive_black_48dp.png b/src/main/res/drawable-hdpi/ic_archive_black_48dp.png
new file mode 100644
index 000000000..1faf474cd
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_archive_black_48dp.png
diff --git a/src/main/res/drawable-hdpi/ic_archive_white_48dp.png b/src/main/res/drawable-hdpi/ic_archive_white_48dp.png
new file mode 100644
index 000000000..462016ade
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_archive_white_48dp.png
diff --git a/src/main/res/drawable-hdpi/ic_description_black_48dp.png b/src/main/res/drawable-hdpi/ic_description_black_48dp.png
new file mode 100644
index 000000000..193ac1011
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_description_black_48dp.png
diff --git a/src/main/res/drawable-hdpi/ic_description_white_48dp.png b/src/main/res/drawable-hdpi/ic_description_white_48dp.png
new file mode 100644
index 000000000..bfb5baa97
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_description_white_48dp.png
diff --git a/src/main/res/drawable-hdpi/ic_event_black_48dp.png b/src/main/res/drawable-hdpi/ic_event_black_48dp.png
new file mode 100644
index 000000000..5cd32f4c2
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_event_black_48dp.png
diff --git a/src/main/res/drawable-hdpi/ic_event_white_48dp.png b/src/main/res/drawable-hdpi/ic_event_white_48dp.png
new file mode 100644
index 000000000..653d15b2b
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_event_white_48dp.png
diff --git a/src/main/res/drawable-hdpi/ic_headset_black_48dp.png b/src/main/res/drawable-hdpi/ic_headset_black_48dp.png
new file mode 100644
index 000000000..8a97fe7ec
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_headset_black_48dp.png
diff --git a/src/main/res/drawable-hdpi/ic_headset_white_48dp.png b/src/main/res/drawable-hdpi/ic_headset_white_48dp.png
new file mode 100644
index 000000000..a4810f277
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_headset_white_48dp.png
diff --git a/src/main/res/drawable-hdpi/ic_mic_black_48dp.png b/src/main/res/drawable-hdpi/ic_mic_black_48dp.png
new file mode 100644
index 000000000..4ed4168cd
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_mic_black_48dp.png
diff --git a/src/main/res/drawable-hdpi/ic_mic_white_48dp.png b/src/main/res/drawable-hdpi/ic_mic_white_48dp.png
new file mode 100644
index 000000000..2d729e773
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_mic_white_48dp.png
diff --git a/src/main/res/drawable-hdpi/ic_person_black_48dp.png b/src/main/res/drawable-hdpi/ic_person_black_48dp.png
new file mode 100644
index 000000000..7401e00b5
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_person_black_48dp.png
diff --git a/src/main/res/drawable-hdpi/ic_person_white_48dp.png b/src/main/res/drawable-hdpi/ic_person_white_48dp.png
new file mode 100644
index 000000000..667c220dd
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_person_white_48dp.png
diff --git a/src/main/res/drawable-hdpi/ic_room_black_48dp.png b/src/main/res/drawable-hdpi/ic_room_black_48dp.png
new file mode 100644
index 000000000..2ebc54430
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_room_black_48dp.png
diff --git a/src/main/res/drawable-hdpi/ic_room_white_48dp.png b/src/main/res/drawable-hdpi/ic_room_white_48dp.png
new file mode 100644
index 000000000..29d2981b2
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_room_white_48dp.png
diff --git a/src/main/res/drawable-mdpi/ic_android_black_48dp.png b/src/main/res/drawable-mdpi/ic_android_black_48dp.png
new file mode 100644
index 000000000..4f25964be
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_android_black_48dp.png
diff --git a/src/main/res/drawable-mdpi/ic_android_white_48dp.png b/src/main/res/drawable-mdpi/ic_android_white_48dp.png
new file mode 100644
index 000000000..032fe2781
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_android_white_48dp.png
diff --git a/src/main/res/drawable-mdpi/ic_archive_black_48dp.png b/src/main/res/drawable-mdpi/ic_archive_black_48dp.png
new file mode 100644
index 000000000..e9d5ed1b4
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_archive_black_48dp.png
diff --git a/src/main/res/drawable-mdpi/ic_archive_white_48dp.png b/src/main/res/drawable-mdpi/ic_archive_white_48dp.png
new file mode 100644
index 000000000..82be16407
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_archive_white_48dp.png
diff --git a/src/main/res/drawable-mdpi/ic_description_black_48dp.png b/src/main/res/drawable-mdpi/ic_description_black_48dp.png
new file mode 100644
index 000000000..7bc6a6846
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_description_black_48dp.png
diff --git a/src/main/res/drawable-mdpi/ic_description_white_48dp.png b/src/main/res/drawable-mdpi/ic_description_white_48dp.png
new file mode 100644
index 000000000..9759bde29
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_description_white_48dp.png
diff --git a/src/main/res/drawable-mdpi/ic_event_black_48dp.png b/src/main/res/drawable-mdpi/ic_event_black_48dp.png
new file mode 100644
index 000000000..8266743b4
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_event_black_48dp.png
diff --git a/src/main/res/drawable-mdpi/ic_event_white_48dp.png b/src/main/res/drawable-mdpi/ic_event_white_48dp.png
new file mode 100644
index 000000000..2fb9a7a2c
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_event_white_48dp.png
diff --git a/src/main/res/drawable-mdpi/ic_headset_black_48dp.png b/src/main/res/drawable-mdpi/ic_headset_black_48dp.png
new file mode 100644
index 000000000..36b513948
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_headset_black_48dp.png
diff --git a/src/main/res/drawable-mdpi/ic_headset_white_48dp.png b/src/main/res/drawable-mdpi/ic_headset_white_48dp.png
new file mode 100644
index 000000000..798e229c7
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_headset_white_48dp.png
diff --git a/src/main/res/drawable-mdpi/ic_mic_black_48dp.png b/src/main/res/drawable-mdpi/ic_mic_black_48dp.png
new file mode 100644
index 000000000..9c7caa295
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_mic_black_48dp.png
diff --git a/src/main/res/drawable-mdpi/ic_mic_white_48dp.png b/src/main/res/drawable-mdpi/ic_mic_white_48dp.png
new file mode 100644
index 000000000..80d851e95
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_mic_white_48dp.png
diff --git a/src/main/res/drawable-mdpi/ic_person_black_48dp.png b/src/main/res/drawable-mdpi/ic_person_black_48dp.png
new file mode 100644
index 000000000..76858f701
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_person_black_48dp.png
diff --git a/src/main/res/drawable-mdpi/ic_person_white_48dp.png b/src/main/res/drawable-mdpi/ic_person_white_48dp.png
new file mode 100644
index 000000000..496699985
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_person_white_48dp.png
diff --git a/src/main/res/drawable-mdpi/ic_room_black_48dp.png b/src/main/res/drawable-mdpi/ic_room_black_48dp.png
new file mode 100644
index 000000000..e60454537
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_room_black_48dp.png
diff --git a/src/main/res/drawable-mdpi/ic_room_white_48dp.png b/src/main/res/drawable-mdpi/ic_room_white_48dp.png
new file mode 100644
index 000000000..8c51d01ad
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_room_white_48dp.png
diff --git a/src/main/res/drawable-xhdpi/ic_android_black_48dp.png b/src/main/res/drawable-xhdpi/ic_android_black_48dp.png
new file mode 100644
index 000000000..9f85a42bf
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_android_black_48dp.png
diff --git a/src/main/res/drawable-xhdpi/ic_android_white_48dp.png b/src/main/res/drawable-xhdpi/ic_android_white_48dp.png
new file mode 100644
index 000000000..913ebd69f
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_android_white_48dp.png
diff --git a/src/main/res/drawable-xhdpi/ic_archive_black_48dp.png b/src/main/res/drawable-xhdpi/ic_archive_black_48dp.png
new file mode 100644
index 000000000..6c383ee81
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_archive_black_48dp.png
diff --git a/src/main/res/drawable-xhdpi/ic_archive_white_48dp.png b/src/main/res/drawable-xhdpi/ic_archive_white_48dp.png
new file mode 100644
index 000000000..dbbf9f870
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_archive_white_48dp.png
diff --git a/src/main/res/drawable-xhdpi/ic_description_black_48dp.png b/src/main/res/drawable-xhdpi/ic_description_black_48dp.png
new file mode 100644
index 000000000..0da5f7798
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_description_black_48dp.png
diff --git a/src/main/res/drawable-xhdpi/ic_description_white_48dp.png b/src/main/res/drawable-xhdpi/ic_description_white_48dp.png
new file mode 100644
index 000000000..e1b8e9aec
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_description_white_48dp.png
diff --git a/src/main/res/drawable-xhdpi/ic_event_black_48dp.png b/src/main/res/drawable-xhdpi/ic_event_black_48dp.png
new file mode 100644
index 000000000..8e43444b7
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_event_black_48dp.png
diff --git a/src/main/res/drawable-xhdpi/ic_event_white_48dp.png b/src/main/res/drawable-xhdpi/ic_event_white_48dp.png
new file mode 100644
index 000000000..be533de42
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_event_white_48dp.png
diff --git a/src/main/res/drawable-xhdpi/ic_headset_black_48dp.png b/src/main/res/drawable-xhdpi/ic_headset_black_48dp.png
new file mode 100644
index 000000000..7f85eb8bb
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_headset_black_48dp.png
diff --git a/src/main/res/drawable-xhdpi/ic_headset_white_48dp.png b/src/main/res/drawable-xhdpi/ic_headset_white_48dp.png
new file mode 100644
index 000000000..b815a1944
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_headset_white_48dp.png
diff --git a/src/main/res/drawable-xhdpi/ic_mic_black_48dp.png b/src/main/res/drawable-xhdpi/ic_mic_black_48dp.png
new file mode 100644
index 000000000..e39b8170c
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_mic_black_48dp.png
diff --git a/src/main/res/drawable-xhdpi/ic_mic_white_48dp.png b/src/main/res/drawable-xhdpi/ic_mic_white_48dp.png
new file mode 100644
index 000000000..ec4405d44
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_mic_white_48dp.png
diff --git a/src/main/res/drawable-xhdpi/ic_person_black_48dp.png b/src/main/res/drawable-xhdpi/ic_person_black_48dp.png
new file mode 100644
index 000000000..2751da525
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_person_black_48dp.png
diff --git a/src/main/res/drawable-xhdpi/ic_person_white_48dp.png b/src/main/res/drawable-xhdpi/ic_person_white_48dp.png
new file mode 100644
index 000000000..6a77a6a38
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_person_white_48dp.png
diff --git a/src/main/res/drawable-xhdpi/ic_room_black_48dp.png b/src/main/res/drawable-xhdpi/ic_room_black_48dp.png
new file mode 100644
index 000000000..9d46eb841
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_room_black_48dp.png
diff --git a/src/main/res/drawable-xhdpi/ic_room_white_48dp.png b/src/main/res/drawable-xhdpi/ic_room_white_48dp.png
new file mode 100644
index 000000000..b7a61a2f5
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_room_white_48dp.png
diff --git a/src/main/res/drawable-xxhdpi/ic_android_black_48dp.png b/src/main/res/drawable-xxhdpi/ic_android_black_48dp.png
new file mode 100644
index 000000000..61b806d38
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_android_black_48dp.png
diff --git a/src/main/res/drawable-xxhdpi/ic_android_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_android_white_48dp.png
new file mode 100644
index 000000000..c3bf2bdc3
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_android_white_48dp.png
diff --git a/src/main/res/drawable-xxhdpi/ic_archive_black_48dp.png b/src/main/res/drawable-xxhdpi/ic_archive_black_48dp.png
new file mode 100644
index 000000000..0155c8104
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_archive_black_48dp.png
diff --git a/src/main/res/drawable-xxhdpi/ic_archive_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_archive_white_48dp.png
new file mode 100644
index 000000000..5a18abe12
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_archive_white_48dp.png
diff --git a/src/main/res/drawable-xxhdpi/ic_description_black_48dp.png b/src/main/res/drawable-xxhdpi/ic_description_black_48dp.png
new file mode 100644
index 000000000..9ddffa1f3
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_description_black_48dp.png
diff --git a/src/main/res/drawable-xxhdpi/ic_description_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_description_white_48dp.png
new file mode 100644
index 000000000..b42cec8eb
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_description_white_48dp.png
diff --git a/src/main/res/drawable-xxhdpi/ic_event_black_48dp.png b/src/main/res/drawable-xxhdpi/ic_event_black_48dp.png
new file mode 100644
index 000000000..3eb5d3073
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_event_black_48dp.png
diff --git a/src/main/res/drawable-xxhdpi/ic_event_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_event_white_48dp.png
new file mode 100644
index 000000000..44ead726f
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_event_white_48dp.png
diff --git a/src/main/res/drawable-xxhdpi/ic_headset_black_48dp.png b/src/main/res/drawable-xxhdpi/ic_headset_black_48dp.png
new file mode 100644
index 000000000..2a8236f35
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_headset_black_48dp.png
diff --git a/src/main/res/drawable-xxhdpi/ic_headset_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_headset_white_48dp.png
new file mode 100644
index 000000000..2b6b2644f
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_headset_white_48dp.png
diff --git a/src/main/res/drawable-xxhdpi/ic_mic_black_48dp.png b/src/main/res/drawable-xxhdpi/ic_mic_black_48dp.png
new file mode 100644
index 000000000..44ef2fb4a
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_mic_black_48dp.png
diff --git a/src/main/res/drawable-xxhdpi/ic_mic_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_mic_white_48dp.png
new file mode 100644
index 000000000..0fc42bfad
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_mic_white_48dp.png
diff --git a/src/main/res/drawable-xxhdpi/ic_person_black_48dp.png b/src/main/res/drawable-xxhdpi/ic_person_black_48dp.png
new file mode 100644
index 000000000..0001aee6b
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_person_black_48dp.png
diff --git a/src/main/res/drawable-xxhdpi/ic_person_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_person_white_48dp.png
new file mode 100644
index 000000000..32fe521d0
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_person_white_48dp.png
diff --git a/src/main/res/drawable-xxhdpi/ic_room_black_48dp.png b/src/main/res/drawable-xxhdpi/ic_room_black_48dp.png
new file mode 100644
index 000000000..e83824a17
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_room_black_48dp.png
diff --git a/src/main/res/drawable-xxhdpi/ic_room_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_room_white_48dp.png
new file mode 100644
index 000000000..dd8eb11d3
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_room_white_48dp.png
diff --git a/src/main/res/drawable-xxxhdpi/ic_android_black_48dp.png b/src/main/res/drawable-xxxhdpi/ic_android_black_48dp.png
new file mode 100644
index 000000000..1d1492b08
--- /dev/null
+++ b/src/main/res/drawable-xxxhdpi/ic_android_black_48dp.png
diff --git a/src/main/res/drawable-xxxhdpi/ic_android_white_48dp.png b/src/main/res/drawable-xxxhdpi/ic_android_white_48dp.png
new file mode 100644
index 000000000..d040e8639
--- /dev/null
+++ b/src/main/res/drawable-xxxhdpi/ic_android_white_48dp.png
diff --git a/src/main/res/drawable-xxxhdpi/ic_archive_black_48dp.png b/src/main/res/drawable-xxxhdpi/ic_archive_black_48dp.png
new file mode 100644
index 000000000..4dd5e44ab
--- /dev/null
+++ b/src/main/res/drawable-xxxhdpi/ic_archive_black_48dp.png
diff --git a/src/main/res/drawable-xxxhdpi/ic_archive_white_48dp.png b/src/main/res/drawable-xxxhdpi/ic_archive_white_48dp.png
new file mode 100644
index 000000000..5ac82a8df
--- /dev/null
+++ b/src/main/res/drawable-xxxhdpi/ic_archive_white_48dp.png
diff --git a/src/main/res/drawable-xxxhdpi/ic_description_black_48dp.png b/src/main/res/drawable-xxxhdpi/ic_description_black_48dp.png
new file mode 100644
index 000000000..f405b2931
--- /dev/null
+++ b/src/main/res/drawable-xxxhdpi/ic_description_black_48dp.png
diff --git a/src/main/res/drawable-xxxhdpi/ic_description_white_48dp.png b/src/main/res/drawable-xxxhdpi/ic_description_white_48dp.png
new file mode 100644
index 000000000..1d32d8841
--- /dev/null
+++ b/src/main/res/drawable-xxxhdpi/ic_description_white_48dp.png
diff --git a/src/main/res/drawable-xxxhdpi/ic_event_black_48dp.png b/src/main/res/drawable-xxxhdpi/ic_event_black_48dp.png
new file mode 100644
index 000000000..038df57d5
--- /dev/null
+++ b/src/main/res/drawable-xxxhdpi/ic_event_black_48dp.png
diff --git a/src/main/res/drawable-xxxhdpi/ic_event_white_48dp.png b/src/main/res/drawable-xxxhdpi/ic_event_white_48dp.png
new file mode 100644
index 000000000..1937048aa
--- /dev/null
+++ b/src/main/res/drawable-xxxhdpi/ic_event_white_48dp.png
diff --git a/src/main/res/drawable-xxxhdpi/ic_headset_black_48dp.png b/src/main/res/drawable-xxxhdpi/ic_headset_black_48dp.png
new file mode 100644
index 000000000..9a9a1b7f6
--- /dev/null
+++ b/src/main/res/drawable-xxxhdpi/ic_headset_black_48dp.png
diff --git a/src/main/res/drawable-xxxhdpi/ic_headset_white_48dp.png b/src/main/res/drawable-xxxhdpi/ic_headset_white_48dp.png
new file mode 100644
index 000000000..ba48f28a1
--- /dev/null
+++ b/src/main/res/drawable-xxxhdpi/ic_headset_white_48dp.png
diff --git a/src/main/res/drawable-xxxhdpi/ic_mic_black_48dp.png b/src/main/res/drawable-xxxhdpi/ic_mic_black_48dp.png
new file mode 100644
index 000000000..f2247b7ff
--- /dev/null
+++ b/src/main/res/drawable-xxxhdpi/ic_mic_black_48dp.png
diff --git a/src/main/res/drawable-xxxhdpi/ic_mic_white_48dp.png b/src/main/res/drawable-xxxhdpi/ic_mic_white_48dp.png
new file mode 100644
index 000000000..e9079bb3b
--- /dev/null
+++ b/src/main/res/drawable-xxxhdpi/ic_mic_white_48dp.png
diff --git a/src/main/res/drawable-xxxhdpi/ic_person_black_48dp.png b/src/main/res/drawable-xxxhdpi/ic_person_black_48dp.png
new file mode 100644
index 000000000..6d377123a
--- /dev/null
+++ b/src/main/res/drawable-xxxhdpi/ic_person_black_48dp.png
diff --git a/src/main/res/drawable-xxxhdpi/ic_person_white_48dp.png b/src/main/res/drawable-xxxhdpi/ic_person_white_48dp.png
new file mode 100644
index 000000000..5bb65aed1
--- /dev/null
+++ b/src/main/res/drawable-xxxhdpi/ic_person_white_48dp.png
diff --git a/src/main/res/drawable-xxxhdpi/ic_room_black_48dp.png b/src/main/res/drawable-xxxhdpi/ic_room_black_48dp.png
new file mode 100644
index 000000000..51d418cf7
--- /dev/null
+++ b/src/main/res/drawable-xxxhdpi/ic_room_black_48dp.png
diff --git a/src/main/res/drawable-xxxhdpi/ic_room_white_48dp.png b/src/main/res/drawable-xxxhdpi/ic_room_white_48dp.png
new file mode 100644
index 000000000..0f7de3f5d
--- /dev/null
+++ b/src/main/res/drawable-xxxhdpi/ic_room_white_48dp.png
diff --git a/src/main/res/layout/fragment_conversation.xml b/src/main/res/layout/fragment_conversation.xml
index 3ddcd69c7..acf42aafe 100644
--- a/src/main/res/layout/fragment_conversation.xml
+++ b/src/main/res/layout/fragment_conversation.xml
@@ -14,6 +14,7 @@
             android:layout_height="match_parent"
             android:layout_above="@+id/snackbar"
             android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true"
             android:layout_alignParentTop="true"
             android:background="?attr/color_background_tertiary"
             android:divider="@null"
@@ -53,7 +54,8 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_alignParentBottom="true"
-            android:layout_alignParentLeft="true">
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true">
 
             <RelativeLayout
                 android:id="@+id/textsend"
@@ -78,13 +80,28 @@
                     android:src="@drawable/ic_send_voice_offline"
                     android:visibility="gone" />
 
+                <android.support.v7.widget.RecyclerView
+                    android:id="@+id/media_preview"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentStart="true"
+                    android:layout_toStartOf="@+id/textSendButton"
+                    android:orientation="horizontal"
+                    android:paddingTop="8dp"
+                    android:requiresFadingEdge="horizontal"
+                    android:visibility="gone"
+                    app:layoutManager="android.support.v7.widget.LinearLayoutManager"
+                    tools:listitem="@layout/media_preview"></android.support.v7.widget.RecyclerView>
+
                 <de.pixart.messenger.ui.widget.EditMessage
                     android:id="@+id/textinput"
                     style="@style/Widget.Conversations.EditText"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:layout_toEndOf="@+id/recordVoiceButton"
                     android:layout_toLeftOf="@+id/textSendButton"
                     android:layout_toRightOf="@+id/recordVoiceButton"
+                    android:layout_toStartOf="@+id/textSendButton"
                     android:background="@drawable/message_bubble_sent_blue"
                     android:ems="10"
                     android:imeOptions="flagNoExtractUi|actionSend"
@@ -105,6 +122,7 @@
                     android:id="@+id/textSendButton"
                     android:layout_width="48dp"
                     android:layout_height="48dp"
+                    android:layout_alignParentEnd="true"
                     android:layout_alignParentRight="true"
                     android:layout_centerVertical="true"
                     android:background="?attr/color_background_tertiary"
@@ -130,15 +148,19 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentLeft="true"
+                android:layout_alignParentStart="true"
                 android:layout_centerVertical="true"
                 android:layout_toLeftOf="@+id/snackbar_action"
+                android:layout_toStartOf="@+id/snackbar_action"
                 android:paddingLeft="24dp"
+                android:paddingStart="24dp"
                 android:textAppearance="@style/TextAppearance.Conversations.Body1.OnDark" />
 
             <TextView
                 android:id="@+id/snackbar_action"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_alignParentEnd="true"
                 android:layout_alignParentRight="true"
                 android:layout_centerVertical="true"
                 android:paddingBottom="16dp"
@@ -166,8 +188,10 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentLeft="true"
+                android:layout_alignParentStart="true"
                 android:layout_centerVertical="true"
                 android:paddingLeft="24dp"
+                android:paddingStart="24dp"
                 android:textColor="@color/realblack"
                 android:textSize="?attr/TextSizeBody" />
         </RelativeLayout>
diff --git a/src/main/res/layout/media_preview.xml b/src/main/res/layout/media_preview.xml
new file mode 100644
index 000000000..8849e7b4a
--- /dev/null
+++ b/src/main/res/layout/media_preview.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <RelativeLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content">
+
+        <ImageView
+            android:id="@+id/media_preview"
+            android:layout_width="@dimen/media_preview_size"
+            android:layout_height="@dimen/media_preview_size"
+            android:layout_centerInParent="true"
+            android:layout_margin="12dp"
+            android:background="@color/black54"
+            android:scaleType="center" />
+
+        <ImageButton
+            android:id="@+id/delete_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentEnd="true"
+            android:layout_alignParentRight="true"
+            android:layout_alignParentTop="true"
+            android:alpha="?attr/delete_icon_alpha"
+            android:background="?attr/selectableItemBackgroundBorderless"
+            android:src="?attr/icon_cancel" />
+    </RelativeLayout>
+</layout>
\ No newline at end of file
diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml
index e89ed2944..b10a13815 100644
--- a/src/main/res/values/attrs.xml
+++ b/src/main/res/values/attrs.xml
@@ -42,6 +42,15 @@
 
     <attr name="conversations_overview_background" format="reference|color" />
 
+    <attr name="media_preview_file" format="reference" />
+    <attr name="media_preview_recording" format="reference" />
+    <attr name="media_preview_audio" format="reference" />
+    <attr name="media_preview_location" format="reference" />
+    <attr name="media_preview_contact" format="reference" />
+    <attr name="media_preview_app" format="reference" />
+    <attr name="media_preview_calendar" format="reference" />
+    <attr name="media_preview_archive" format="reference" />
+
     <attr name="icon_add_group" format="reference" />
     <attr name="icon_add_person" format="reference" />
     <attr name="icon_cancel" format="reference" />
@@ -90,6 +99,7 @@
     <attr name="ic_file_calendar" format="reference" />
 
     <attr name="icon_alpha" format="float" />
+    <attr name="delete_icon_alpha" format="float" />
 
     <attr name="popupOverlayStyle" format="reference" />
 
diff --git a/src/main/res/values/defaults.xml b/src/main/res/values/defaults.xml
index 4867a8e95..e213ea773 100644
--- a/src/main/res/values/defaults.xml
+++ b/src/main/res/values/defaults.xml
@@ -86,7 +86,6 @@
     <bool name="btbv">true</bool>
     <bool name="send_button_status">true</bool>
     <string name="quick_action">recent</string>
-    <bool name="return_to_previous">false</bool>
     <bool name="display_enter_key">false</bool>
     <bool name="show_dynamic_tags">false</bool>
     <integer name="grace_period">144</integer>
diff --git a/src/main/res/values/dimens.xml b/src/main/res/values/dimens.xml
index 50f955c89..c420781ea 100644
--- a/src/main/res/values/dimens.xml
+++ b/src/main/res/values/dimens.xml
@@ -10,6 +10,7 @@
     <dimen name="audio_player_width">224dp</dimen>
     <dimen name="avatar_item_distance">16dp</dimen>
 
+    <dimen name="media_preview_size">80dp</dimen>
     <dimen name="toolbar_elevation">4dp</dimen>
 
     <dimen name="publish_avatar_top_margin">8dp</dimen>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index aefe978c0..e5261bb44 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -712,8 +712,6 @@
     <string name="contacts_have_read_up_to_this_point">%s have read up to this point</string>
     <string name="contact_has_read_up_to_this_point">%s has read up to this point</string>
     <string name="contacts_and_n_more_have_read_up_to_this_point">%1$s and %2$d more have read up to this point</string>
-    <string name="pref_return_to_previous">Quick Sharing</string>
-    <string name="pref_return_to_previous_summary">Immediately return to previous activity instead of opening the conversation after sharing something</string>
     <string name="conversation_unencrypted_hint">This chat is unencrypted, for security reasons you should activate message encryption by using the lock icon. The preferable encryption is OMEMO.</string>
     <string name="pref_warn_unencrypted_chat">Warn if chat is unencrypted</string>
     <string name="pref_warn_unencrypted_chat_summary">If message encryption is available, you should use it. If you don\'t use message encryption, show a warning message inside the chat.</string>
diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml
index 0e58f26a6..628963db2 100644
--- a/src/main/res/values/themes.xml
+++ b/src/main/res/values/themes.xml
@@ -65,6 +65,15 @@
         </item>
         <item name="ic_send_voice_offline" type="reference">@drawable/ic_send_voice_offline</item>
 
+        <item name="media_preview_file" type="reference">@drawable/ic_description_black_48dp</item>
+        <item name="media_preview_recording" type="reference">@drawable/ic_mic_black_48dp</item>
+        <item name="media_preview_audio" type="reference">@drawable/ic_headset_black_48dp</item>
+        <item name="media_preview_location" type="reference">@drawable/ic_room_black_48dp</item>
+        <item name="media_preview_contact" type="reference">@drawable/ic_person_black_48dp</item>
+        <item name="media_preview_app" type="reference">@drawable/ic_android_black_48dp</item>
+        <item name="media_preview_calendar" type="reference">@drawable/ic_event_black_48dp</item>
+        <item name="media_preview_archive" type="reference">@drawable/ic_archive_black_48dp</item>
+
         <item name="icon_add_group" type="reference">@drawable/ic_group_add_white_24dp</item>
         <item name="icon_add_person" type="reference">@drawable/ic_person_add_white_24dp</item>
         <item name="icon_cancel" type="reference">@drawable/ic_cancel_black_24dp</item>
@@ -106,6 +115,7 @@
         <item name="dialog_horizontal_padding">16dp</item>
         <item name="dialog_vertical_padding">16dp</item>
         <item name="icon_alpha" type="float">0.54</item>
+        <item name="delete_icon_alpha" type="float">0.70</item>
 
         <item name="ic_attach_camera" type="reference">@drawable/ic_attach_camera</item>
         <item name="ic_attach_document" type="reference">@drawable/ic_attach_document</item>
@@ -219,10 +229,20 @@
         <item name="conversations_overview_background">@color/primary_dark</item>
 
         <item name="icon_alpha" type="float">0.7</item>
+        <item name="delete_icon_alpha" type="float">0.7</item>
 
         <item name="dialog_horizontal_padding">24dp</item>
         <item name="dialog_vertical_padding">16dp</item>
 
+        <item name="media_preview_file" type="reference">@drawable/ic_description_white_48dp</item>
+        <item name="media_preview_recording" type="reference">@drawable/ic_mic_white_48dp</item>
+        <item name="media_preview_audio" type="reference">@drawable/ic_headset_white_48dp</item>
+        <item name="media_preview_location" type="reference">@drawable/ic_room_white_48dp</item>
+        <item name="media_preview_contact" type="reference">@drawable/ic_person_white_48dp</item>
+        <item name="media_preview_app" type="reference">@drawable/ic_android_white_48dp</item>
+        <item name="media_preview_calendar" type="reference">@drawable/ic_event_white_48dp</item>
+        <item name="media_preview_archive" type="reference">@drawable/ic_archive_white_48dp</item>
+
         <item name="icon_add_group" type="reference">@drawable/ic_group_add_white_24dp</item>
         <item name="icon_add_person" type="reference">@drawable/ic_person_add_white_24dp</item>
         <item name="icon_cancel" type="reference">@drawable/ic_cancel_white_24dp</item>
diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml
index d6241a5ff..819fcded9 100644
--- a/src/main/res/xml/preferences.xml
+++ b/src/main/res/xml/preferences.xml
@@ -203,11 +203,6 @@
             android:key="video_compression"
             android:summary="@string/pref_video_compression_summary"
             android:title="@string/pref_video_compression" />
-        <CheckBoxPreference
-            android:defaultValue="@bool/return_to_previous"
-            android:key="return_to_previous"
-            android:summary="@string/pref_return_to_previous_summary"
-            android:title="@string/pref_return_to_previous" />
     </PreferenceScreen>
     <!--status-->
     <PreferenceScreen