messaging-app

Merge lp:~renatofilho/messaging-app/rtm-fit-finish2 into lp:messaging-app

rtm-fit-finish2
Merge into trunk

Proposed by Renato Araujo Oliveira Filho on 2014-07-31

Status:	Superseded
Proposed branch:	lp:~renatofilho/messaging-app/rtm-fit-finish2
Merge into:	lp:messaging-app
Diff against target:	2612 lines (+1261/-658) 34 files modified debian/control (+2/-0) debian/messaging-app.install (+1/-0) src/main.cpp (+2/-0) src/qml/CMakeLists.txt (+1/-0) src/qml/Dialogs/CMakeLists.txt (+7/-0) src/qml/Dialogs/NoDefaultSIMCardDialog.qml (+91/-0) src/qml/Dialogs/NoSIMCardSelectedDialog.qml (+38/-0) src/qml/Dialogs/SetDefaultSIMCardDialog.qml (+73/-0) src/qml/KeyboardRectangle.qml (+1/-1) src/qml/MMS/MMSBase.qml (+5/-74) src/qml/MMS/MMSContact.qml (+58/-78) src/qml/MMS/MMSDefault.qml (+3/-41) src/qml/MMS/MMSImage.qml (+42/-24) src/qml/MMS/MMSVideo.qml (+5/-40) src/qml/MMS/Previewer.qml (+2/-2) src/qml/MMS/PreviewerContact.qml (+5/-3) src/qml/MMS/PreviewerImage.qml (+2/-2) src/qml/MMS/PreviewerVideo.qml (+2/-2) src/qml/MMSDelegate.qml (+198/-0) src/qml/MainPage.qml (+34/-2) src/qml/MessageBubble.qml (+27/-19) src/qml/MessageDateSection.qml (+38/-0) src/qml/MessageDelegate.qml (+39/-235) src/qml/MessageDelegateFactory.qml (+203/-0) src/qml/MessageInfoDialog.qml (+124/-0) src/qml/Messages.qml (+109/-106) src/qml/MultiRecipientInput.qml (+1/-1) src/qml/NewRecipientPage.qml (+1/-1) src/qml/SMSDelegate.qml (+75/-0) src/qml/StandardAnimation.qml (+1/-1) src/qml/ThreadDelegate.qml (+29/-13) src/qml/messaging-app.qml (+29/-1) tests/autopilot/messaging_app/emulators.py (+8/-7) tests/qml/tst_MessageBubble.qml (+5/-5)
To merge this branch:	bzr merge lp:~renatofilho/messaging-app/rtm-fit-finish2
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Needs Fixing on 2014-08-12
Ubuntu Phablet Team		2014-07-31	Pending
Review via email: mp+229089@code.launchpad.net

This proposal has been superseded by a proposal from 2014-08-12.

Commit message

- Fixed wrong icon for group chat
- Implemented handling of not sent sms/mms swipe for more options
- RETRY for failed messages should go as well into the left tug
- Move selection tick to the center of the item
- Set a limit for message input field maximum height
- Once user types in a name into the “add contact” field and there is a matching list, the “compose message” entry field can disappear
- Handle the message as only one item for swipe acctions
- Created sections for dates on chat window
- Fixed vcard attachment visuals based on designer spec
- Make timestamp visible on image attachments if it is the only item of the message
- Display Account name together with timestamp (Temporary solution)
- Show message info dialog

Description of the change

You need the new model to get this working: https://code.launchpad.net/~renatofilho/history-service/export-qml-sortproxymodel/+merge/229802

lp:~renatofilho/messaging-app/rtm-fit-finish2 updated on 2014-07-31

202. By Renato Araujo Oliveira Filho on 2014-07-31: Parent branch merged.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-31:

FAILED: Continuous integration, rev:201
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/340/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2848/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/2265/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-amd64-ci/134/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-armhf-ci/134/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-i386-ci/134/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4091/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2528/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/messaging-app-ci/340/rebuild

review: Needs Fixing (continuous-integration)

lp:~renatofilho/messaging-app/rtm-fit-finish2 updated on 2014-07-31

203. By Renato Araujo Oliveira Filho on 2014-07-31: Fixed retry button alingment.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-31:

FAILED: Continuous integration, rev:202
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/342/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2857/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/2272/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-amd64-ci/136/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-armhf-ci/136/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-i386-ci/136/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4100/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2535/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/messaging-app-ci/342/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-31:

FAILED: Continuous integration, rev:203
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/344/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2864/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/2277/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-amd64-ci/138/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-armhf-ci/138/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-i386-ci/138/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4107/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2540/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/messaging-app-ci/344/rebuild

review: Needs Fixing (continuous-integration)

lp:~renatofilho/messaging-app/rtm-fit-finish2 updated on 2014-08-01

204. By Renato Araujo Oliveira Filho on 2014-07-31: Fixed QML warnings.
205. By Renato Araujo Oliveira Filho on 2014-07-31: Parent merged.
206. By Renato Araujo Oliveira Filho on 2014-08-01: Parent merged.
207. By Renato Araujo Oliveira Filho on 2014-08-01: [Messages] Make the bottom panel invisible during a contact search.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-01:

FAILED: Continuous integration, rev:207
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/348/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2895/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/2291/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-amd64-ci/142/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-armhf-ci/142/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-i386-ci/142/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4138/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2556/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/messaging-app-ci/348/rebuild

review: Needs Fixing (continuous-integration)

lp:~renatofilho/messaging-app/rtm-fit-finish2 updated on 2014-08-01

208. By Renato Araujo Oliveira Filho on 2014-08-01: [Message] Fix search list view animation to appear and disappear.
209. By Renato Araujo Oliveira Filho on 2014-08-01: Use empty title on selection mode.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-01:

FAILED: Continuous integration, rev:208
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/349/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2898/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/2292/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-amd64-ci/143/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-armhf-ci/143/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-i386-ci/143/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4141/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2557/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/messaging-app-ci/349/rebuild

review: Needs Fixing (continuous-integration)

lp:~renatofilho/messaging-app/rtm-fit-finish2 updated on 2014-08-01

210. By Renato Araujo Oliveira Filho on 2014-08-01: Added "Retry" action on righSide actions.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-01:

FAILED: Continuous integration, rev:209
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/350/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2903/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/2296/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-amd64-ci/144/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-armhf-ci/144/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-i386-ci/144/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4146/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2561/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/messaging-app-ci/350/rebuild

review: Needs Fixing (continuous-integration)

lp:~renatofilho/messaging-app/rtm-fit-finish2 updated on 2014-08-01

211. By Renato Araujo Oliveira Filho on 2014-08-01: Revert changes on test CMakeLists.txt
212. By Renato Araujo Oliveira Filho on 2014-08-01: Fix retry button alingment.
213. By Renato Araujo Oliveira Filho on 2014-08-01: Avoid go to preview mode during the selection mode.
214. By Renato Araujo Oliveira Filho on 2014-08-01: Better implementation of avoid clicking on attachment during the selection mode.
215. By Renato Araujo Oliveira Filho on 2014-08-01: Only shows the number of participants on messaging chat window.
216. By Renato Araujo Oliveira Filho on 2014-08-01: Show the group icon for group conversation thread

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-01:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/messaging-app-ci/351/rebuild

review: Needs Fixing (continuous-integration)

lp:~renatofilho/messaging-app/rtm-fit-finish2 updated on 2014-08-01

217. By Renato Araujo Oliveira Filho on 2014-08-01: Fixed TreadDelegate top margin.
218. By Renato Araujo Oliveira Filho on 2014-08-01: Updated the white bubble.
Updated ThreadDelegate visuals.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-01:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/messaging-app-ci/353/rebuild

review: Needs Fixing (continuous-integration)

lp:~renatofilho/messaging-app/rtm-fit-finish2 updated on 2014-08-04

219. By Renato Araujo Oliveira Filho on 2014-08-04: Updated contact vcard attachment visual.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-04:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/messaging-app-ci/356/rebuild

review: Needs Fixing (continuous-integration)

lp:~renatofilho/messaging-app/rtm-fit-finish2 updated on 2014-08-05

220. By Renato Araujo Oliveira Filho on 2014-08-05: Add timestamp in image bottom if the message does not contain text.
221. By Renato Araujo Oliveira Filho on 2014-08-05: Trunk merged.
222. By Renato Araujo Oliveira Filho on 2014-08-05: Implemented conversation section for dates.
223. By Renato Araujo Oliveira Filho on 2014-08-05: display account label in the timestamp.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-06:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/messaging-app-ci/358/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-06:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/messaging-app-ci/360/rebuild

review: Needs Fixing (continuous-integration)

lp:~renatofilho/messaging-app/rtm-fit-finish2 updated on 2014-08-06

224. By Renato Araujo Oliveira Filho on 2014-08-06: Merged "lp:~boiko/messaging-app/fix_autopilot2"
225. By Renato Araujo Oliveira Filho on 2014-08-06: Set the minimum version required for qtdeclarative5-ubuntu-contacts0.1
226. By Renato Araujo Oliveira Filho on 2014-08-06: Fixed multiple selection mode.
227. By Renato Araujo Oliveira Filho on 2014-08-06: Update autopilot tests.
228. By Renato Araujo Oliveira Filho on 2014-08-06: Update autopilot tests.
229. By Renato Araujo Oliveira Filho on 2014-08-06: Fixed bubble size.
Fixed bubble font color for incoming message.
Fixed account label on bubble.
230. By Renato Araujo Oliveira Filho on 2014-08-06: Fixed MessageBubble width.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-06:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/messaging-app-ci/363/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-07:

FAILED: Continuous integration, rev:230
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/365/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3137/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/2463/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-amd64-ci/159/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-armhf-ci/159/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-i386-ci/159/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4381/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2733/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/messaging-app-ci/365/rebuild

review: Needs Fixing (continuous-integration)

lp:~renatofilho/messaging-app/rtm-fit-finish2 updated on 2014-08-07

231. By Renato Araujo Oliveira Filho on 2014-08-07: Trunk merged.
232. By Renato Araujo Oliveira Filho on 2014-08-07: Updated unit test.
233. By Renato Araujo Oliveira Filho on 2014-08-07: Used section to show the dates.
234. By Renato Araujo Oliveira Filho on 2014-08-07: Implemented message info dialog and right action.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-07:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/messaging-app-ci/368/rebuild

review: Needs Fixing (continuous-integration)

lp:~renatofilho/messaging-app/rtm-fit-finish2 updated on 2014-08-08

235. By Renato Araujo Oliveira Filho on 2014-08-08: Use Manual created sections because of the verticalLayoutDirection used by Messages list view.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-08:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/messaging-app-ci/369/rebuild

review: Approve (continuous-integration)

lp:~renatofilho/messaging-app/rtm-fit-finish2 updated on 2014-08-08

236. By Renato Araujo Oliveira Filho on 2014-08-08: Update message info dialog.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-09:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/messaging-app-ci/370/rebuild

review: Approve (continuous-integration)

lp:~renatofilho/messaging-app/rtm-fit-finish2 updated on 2014-08-09

237. By Renato Araujo Oliveira Filho on 2014-08-09: Show hardcoded status "Received" for received messages.
238. By Renato Araujo Oliveira Filho on 2014-08-09: Fixed selectionMode for ThreadDelegate.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-09:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/messaging-app-ci/371/rebuild

review: Approve (continuous-integration)

lp:~renatofilho/messaging-app/rtm-fit-finish2 updated on 2014-08-11

239. By Renato Araujo Oliveira Filho on 2014-08-11

Make sure that the timestamp and sim name get ellipsized correct.

240. By Renato Araujo Oliveira Filho on 2014-08-11

Fixed timestamp maximum width.

241. By Renato Araujo Oliveira Filho on 2014-08-11

Fixed select all messages to make sure that unselect all if all messages is already selected.

242. By Renato Araujo Oliveira Filho on 2014-08-11

Fixed item display for missing file.

In case of the MMS data file was deleted we need to be able to display the message with the remaning information.

243. By Renato Araujo Oliveira Filho on 2014-08-11

Fixed contact preview page to show "Unknown contact" when the contact name is empty.

244. By Renato Araujo Oliveira Filho on 2014-08-11

Manually set the dialog parent.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-12:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/messaging-app-ci/375/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-12:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/messaging-app-ci/377/rebuild

review: Needs Fixing (continuous-integration)

lp:~renatofilho/messaging-app/rtm-fit-finish2 updated on 2014-08-12

245. By Renato Araujo Oliveira Filho on 2014-08-12: Merged "lp:~tiagosh/messaging-app/dual-sim-settings"

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Renato Araujo Oliveira Filho

Sam Short

Ubuntu Phablet Team

 === modified file 'debian/control'
 --- debian/control	2014-08-06 15:11:02 +0000
 +++ debian/control	2014-08-12 15:31:06 +0000
@@ -13,6 +13,7 @@
                 qtbase5-dev (>= 5.0),
                 qtdeclarative5-dev (>= 5.0),
                 qtdeclarative5-dev-tools,
++               qtdeclarative5-gsettings1.0,
                 qtdeclarative5-ubuntu-ui-toolkit-plugin,
                 qtdeclarative5-ubuntu-history0.1,
                 qtpim5-dev,
@@ -33,6 +34,7 @@
           qtdeclarative5-ubuntu-telephony0.1 | qtdeclarative5-ubuntu-telephony-plugin,
           qtdeclarative5-ubuntu-contacts0.1 (>= 0.2+14.10.20140805),
           qtdeclarative5-qtcontacts-plugin,
++         qml-module-qt-labs-settings,
  Recommends: unity8 (>= 7.81.0~),
  Description: messaging application for Ubuntu
   An application to send and receive messages.
 === modified file 'debian/messaging-app.install'
 --- debian/messaging-app.install	2014-06-26 19:26:17 +0000
 +++ debian/messaging-app.install	2014-08-12 15:31:06 +0000
@@ -7,4 +7,5 @@
  usr/share/messaging-app/assets
  usr/share/messaging-app/3rd_party
  usr/share/messaging-app/MMS/*.qml
++usr/share/messaging-app/Dialogs/*.qml
  usr/bin/*messaging-app*
 === modified file 'src/main.cpp'
 --- src/main.cpp	2013-07-15 20:33:33 +0000
 +++ src/main.cpp	2014-08-12 15:31:06 +0000
@@ -39,6 +39,8 @@
  int main(int argc, char** argv)
+ {
      QGuiApplication::setApplicationName("Messaging App");
++    QGuiApplication::setOrganizationName("com.ubuntu.messaging-app");
++
      MessagingApplication application(argc, argv);
      if (!application.setup()) {
 === modified file 'src/qml/CMakeLists.txt'
 --- src/qml/CMakeLists.txt	2014-07-31 13:29:54 +0000
 +++ src/qml/CMakeLists.txt	2014-08-12 15:31:06 +0000
@@ -16,3 +16,4 @@
  install(DIRECTORY ${3RD_PARTY_DIR} DESTINATION ${MESSAGING_APP_DIR})
  add_subdirectory(MMS)
++add_subdirectory(Dialogs)
 === added directory 'src/qml/Dialogs'
 === added file 'src/qml/Dialogs/CMakeLists.txt'
 --- src/qml/Dialogs/CMakeLists.txt	1970-01-01 00:00:00 +0000
 +++ src/qml/Dialogs/CMakeLists.txt	2014-08-12 15:31:06 +0000
@@ -0,0 +1,7 @@
++file(GLOB DIALOGS_QML_JS_FILES *.qml *.js)
++
++# make the files visible on qtcreator
++add_custom_target(messaging_dialogs_QMlFiles ALL SOURCES ${DIALOGS_QML_JS_FILES})
++
++install(FILES ${DIALOGS_QML_JS_FILES} DESTINATION ${MESSAGING_APP_DIR}/Dialogs)
++
 === added file 'src/qml/Dialogs/NoDefaultSIMCardDialog.qml'
 --- src/qml/Dialogs/NoDefaultSIMCardDialog.qml	1970-01-01 00:00:00 +0000
 +++ src/qml/Dialogs/NoDefaultSIMCardDialog.qml	2014-08-12 15:31:06 +0000
@@ -0,0 +1,91 @@
++/*
++ * Copyright 2012-2013 Canonical Ltd.
++ *
++ * This file is part of messaging-app.
++ *
++ * messaging-app is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * messaging-app is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++import QtQuick 2.0
++import Ubuntu.Components 1.1
++import Ubuntu.Components.Popups 0.1
++import Ubuntu.Telephony 0.1
++
++Component {
++    Dialog {
++        id: dialogue
++        title: i18n.tr("Switch to default SIM:")
++        Column {
++            anchors.left: parent.left
++            anchors.right: parent.right
++            spacing: units.gu(2)
++
++            Row {
++                spacing: units.gu(4)
++                anchors.horizontalCenter: parent.horizontalCenter
++                height: paintedHeight + units.gu(3)
++                Repeater {
++                    model: telepathyHelper.accounts
++                    delegate: Label {
++                        text: modelData.displayName
++                        color: UbuntuColors.orange
++                        MouseArea {
++                            anchors.fill: parent
++                            onClicked: {
++                                PopupUtils.close(dialogue)
++                                telepathyHelper.setDefaultAccount(TelepathyHelper.Messaging, modelData)
++                            }
++                        }
++                    }
++                }
++            }
++
++            Label {
++                anchors.left: parent.left
++                anchors.right: parent.right
++                height: paintedHeight + units.gu(6)
++                verticalAlignment: Text.AlignVCenter
++                text: i18n.tr("Select a default SIM for all outgoing messages. You can always alter your choice in <a href=\"system_settings\">System Settings</a>.")
++                wrapMode: Text.WordWrap
++                onLinkActivated: {
++                    PopupUtils.close(dialogue)
++                    Qt.openUrlExternally("settings:///system/cellular")
++                }
++            }
++            Row {
++                spacing: units.gu(4)
++                anchors.horizontalCenter: parent.horizontalCenter
++                Button {
++                    objectName: "noNoSimCardDefaultDialog"
++                    text: i18n.tr("No")
++                    color: UbuntuColors.orange
++                    onClicked: {
++                        settings.mainViewDontAskCount = 3
++                        PopupUtils.close(dialogue)
++                        Qt.inputMethod.hide()
++                    }
++                }
++                Button {
++                    objectName: "laterNoSimCardDefaultDialog"
++                    text: i18n.tr("Later")
++                    color: UbuntuColors.orange
++                    onClicked: {
++                        PopupUtils.close(dialogue)
++                        settings.mainViewDontAskCount++
++                        Qt.inputMethod.hide()
++                    }
++                }
++            }
++        }
++    }
++}
 === added file 'src/qml/Dialogs/NoSIMCardSelectedDialog.qml'
 --- src/qml/Dialogs/NoSIMCardSelectedDialog.qml	1970-01-01 00:00:00 +0000
 +++ src/qml/Dialogs/NoSIMCardSelectedDialog.qml	2014-08-12 15:31:06 +0000
@@ -0,0 +1,38 @@
++/*
++ * Copyright 2012-2013 Canonical Ltd.
++ *
++ * This file is part of messaging-app.
++ *
++ * messaging-app is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * messaging-app is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++import QtQuick 2.0
++import Ubuntu.Components 1.1
++import Ubuntu.Components.Popups 0.1
++
++Component {
++    Dialog {
++        id: dialogue
++        title: i18n.tr("No SIM card selected")
++        text: i18n.tr("You need to select a SIM card")
++        Button {
++            objectName: "closeNoSimCardSelectedDialog"
++            text: i18n.tr("Close")
++            color: UbuntuColors.orange
++            onClicked: {
++                PopupUtils.close(dialogue)
++                Qt.inputMethod.hide()
++            }
++        }
++    }
++}
 === added file 'src/qml/Dialogs/SetDefaultSIMCardDialog.qml'
 --- src/qml/Dialogs/SetDefaultSIMCardDialog.qml	1970-01-01 00:00:00 +0000
 +++ src/qml/Dialogs/SetDefaultSIMCardDialog.qml	2014-08-12 15:31:06 +0000
@@ -0,0 +1,73 @@
++/*
++ * Copyright 2012-2013 Canonical Ltd.
++ *
++ * This file is part of messaging-app.
++ *
++ * messaging-app is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * messaging-app is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++import QtQuick 2.0
++import Ubuntu.Components 1.1
++import Ubuntu.Components.Popups 0.1
++import Ubuntu.Telephony 0.1
++
++Component {
++    id: setDefaultSimCardDialog
++    Dialog {
++        id: dialogue
++        text: i18n.tr("Change all Messaging associations to " + messages.account.displayName +"?")
++        Column {
++            anchors.left: parent.left
++            anchors.right: parent.right
++            spacing: units.gu(2)
++            Row {
++                anchors.horizontalCenter: parent.horizontalCenter
++                spacing: units.gu(4)
++                Button {
++                    objectName: "setDefaultSimCardDialogNo"
++                    text: i18n.tr("No")
++                    color: UbuntuColors.orange
++                    onClicked: {
++                        PopupUtils.close(dialogue)
++                        Qt.inputMethod.hide()
++                    }
++                }
++                Button {
++                    objectName: "setDefaultSimCardDialogYes"
++                    text: i18n.tr("Yes")
++                    color: UbuntuColors.orange
++                    onClicked: {
++                        telepathyHelper.setDefaultAccount(TelepathyHelper.Messaging, messages.account)
++                        PopupUtils.close(dialogue)
++                        Qt.inputMethod.hide()
++                    }
++                }
++            }
++            Row {
++                CheckBox {
++                    id: dontAskAgainCheckbox
++                    checked: false
++                    onCheckedChanged: settings.messagesDontAsk = checked
++                }
++                Label {
++                    text: i18n.tr("Don't ask again")
++                    anchors.verticalCenter: dontAskAgainCheckbox.verticalCenter
++                    MouseArea {
++                        anchors.fill: parent
++                        onClicked: dontAskAgainCheckbox.checked = !dontAskAgainCheckbox.checked
++                    }
++                }
++            }
++        }
++    }
++}
 === modified file 'src/qml/KeyboardRectangle.qml'
 --- src/qml/KeyboardRectangle.qml	2014-07-25 16:22:54 +0000
 +++ src/qml/KeyboardRectangle.qml	2014-08-12 15:31:06 +0000
@@ -16,7 +16,7 @@
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
--import QtQuick 2.0
++import QtQuick 2.2
  Item {
      id: keyboardRect
 === modified file 'src/qml/MMS/MMSBase.qml'
 --- src/qml/MMS/MMSBase.qml	2014-07-31 19:58:34 +0000
 +++ src/qml/MMS/MMSBase.qml	2014-08-12 15:31:06 +0000
@@ -16,82 +16,13 @@
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
  import QtQuick 2.2
--import Ubuntu.Components 1.1
--import Ubuntu.Contacts 0.1
--ListItemWithActions {
++Item {
      id: baseDelegate
      property var attachment
--    property bool parentSelected: false
--    property bool incoming
--    property bool showInfo: false
--
--    signal itemRemoved()
--    signal attachmentClicked()
--
--    function checkClick(bubble, mouse) {
--        var itemX1 = bubble.x
--        var itemX2 = itemX1+bubble.width
--        var itemY1 = bubble.y
--        var itemY2 = itemY1+bubble.height
--        if (mouse.x >= itemX1 && mouse.x <= itemX2 &&
--            mouse.y >= itemY1 && mouse.y <= itemY2) {
--            return true
--        }
--        return false
--    }
--
--    Component.onCompleted: {
--        visibleAttachments++
--    }
--    Component.onDestruction:  {
--        visibleAttachments--
--    }
--
--    leftSideAction: Action {
--        iconName: "delete"
--        text: i18n.tr("Delete")
--        onTriggered: baseDelegate.itemRemoved()
--    }
--
--    internalAnchors {
--        topMargin: 0
--        bottomMargin: 0
--    }
--
--    color: parentSelected ? selectedColor : Theme.palette.normal.background
--    states: [
--        State {
--            when: incoming
--            name: "incoming"
--            AnchorChanges {
--                target: bubble
--                anchors.left: parent.left
--                anchors.right: undefined
--            }
--            PropertyChanges {
--                target: bubble
--                anchors.leftMargin: units.gu(1)
--                anchors.rightMargin: 0
--            }
--        },
--        State {
--            when: !incoming
--            name: "outgoing"
--            AnchorChanges {
--                target: bubble
--                anchors.left: undefined
--                anchors.right: parent.right
--            }
--            PropertyChanges {
--                target: bubble
--                anchors.leftMargin: 0
--                anchors.rightMargin: units.gu(1)
--            }
--        }
--    ]
--
--    onSwippingChanged: messageList.updateSwippedItem(baseDelegate)
--    onSwipeStateChanged: messageList.updateSwippedItem(baseDelegate)
++    property string previewer
++    property bool incoming: false
++    property bool lastItem: false
++    property string timestamp
+ }
 === modified file 'src/qml/MMS/MMSContact.qml'
 --- src/qml/MMS/MMSContact.qml	2014-07-31 19:01:23 +0000
 +++ src/qml/MMS/MMSContact.qml	2014-08-12 15:31:06 +0000
@@ -16,93 +16,73 @@
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
--import QtQuick 2.0
--import Ubuntu.Components 0.1
++import QtQuick 2.2
++import Ubuntu.Components 1.1
  import Ubuntu.Contacts 0.1
--import ".."
++import Ubuntu.History 0.1
  MMSBase {
      id: vcardDelegate
--    property string previewer: "MMS/PreviewerContact.qml"
--    onItemClicked: {
--        if (checkClick(bubble, mouse)) {
--            attachmentClicked()
--        }
--    }
--    states: [
--        State {
--            name: "incoming"
--            AnchorChanges {
--                target: bubble
--                anchors.left: parent.left
--                anchors.right: undefined
--            }
--            PropertyChanges {
--                target: bubble
--                anchors.leftMargin: units.gu(1)
--                anchors.rightMargin: units.gu(1)
--            }
--            AnchorChanges {
--                target: contactName
--                anchors.left: bubble.right
--                anchors.right: undefined
--            }
--            PropertyChanges {
--                target: contactName
--                anchors.leftMargin: units.gu(2)
--                anchors.rightMargin: units.gu(2)
--            }
--        },
--        State {
--            name: "outgoing"
--            AnchorChanges {
--                target: bubble
--                anchors.left: undefined
--                anchors.right: parent.right
--            }
--            PropertyChanges {
--                target: bubble
--                anchors.leftMargin: units.gu(1)
--                anchors.rightMargin: units.gu(1)
--            }
--            AnchorChanges {
--                target: contactName
--                anchors.left: undefined
--                anchors.right: bubble.left
--            }
--            PropertyChanges {
--                target: contactName
--                anchors.leftMargin: units.gu(2)
--                anchors.rightMargin: units.gu(2)
--            }
--        }
--    ]
--    height: bubble.height + units.gu(2)
--    Item {
++
++    readonly property bool error: (textMessageStatus === HistoryThreadModel.MessageStatusPermanentlyFailed)
++    readonly property bool sending: (textMessageStatus === HistoryThreadModel.MessageStatusUnknown ||
++                                     textMessageStatus === HistoryThreadModel.MessageStatusTemporarilyFailed) && !incoming
++
++    previewer: "MMS/PreviewerContact.qml"
++    height: units.gu(8)
++    width: units.gu(27)
++
++    Rectangle {
          id: bubble
--        anchors.top: parent.top
--        width: avatar.width
--        height: avatar.height
++
++        anchors.fill: parent
++        color: {
++            if (error) {
++                return "#fc4949"
++            } else if (sending) {
++                return "#b2b2b2"
++            } else if (incoming) {
++                return "#ffffff"
++            } else {
++                return "#3fb24f"
++            }
++        }
++        radius: height * 0.1
++
          ContactAvatar {
              id: avatar
++            anchors {
++                top: parent.top
++                topMargin: units.gu(1)
++                bottom: parent.bottom
++                bottomMargin: units.gu(1)
++                left: parent.left
++                leftMargin: units.gu(1)
++            }
              fallbackAvatarUrl: "image://theme/contact"
              fallbackDisplayName: contactName.name
--            anchors.centerIn: parent
--            height: units.gu(6)
--            width: units.gu(6)
--        }
--    }
--    Label {
--        id: contactName
--        property string name: application.contactNameFromVCard(attachment.filePath)
--        anchors.bottom: bubble.bottom
--        anchors.left: incoming ? bubble.right : undefined
--        anchors.right: !incoming ? bubble.left : undefined
--        anchors.rightMargin: !incoming ? units.gu(1) : undefined
--        anchors.leftMargin: incoming ? units.gu(1) : undefined
--        text: name !== "" ? name : i18n.tr("Unknown contact")
--        height: paintedHeight
--        width: paintedWidth
++            width: height
++        }
++
++        Label {
++            id: contactName
++
++            property string name: application.contactNameFromVCard(attachment.filePath)
++
++            anchors {
++                left: avatar.right
++                leftMargin: units.gu(1)
++                top: avatar.top
++                bottom: avatar.bottom
++                right: parent.right
++                rightMargin: units.gu(1)
++            }
++
++            verticalAlignment: Text.AlignVCenter
++            text: name !== "" ? name : i18n.tr("Unknown contact")
++            elide: Text.ElideRight
++            color: vcardDelegate.incoming ? UbuntuColors.darkGrey : "#ffffff"
++        }
+     }
+ }
 === modified file 'src/qml/MMS/MMSDefault.qml'
 --- src/qml/MMS/MMSDefault.qml	2014-07-31 19:01:23 +0000
 +++ src/qml/MMS/MMSDefault.qml	2014-08-12 15:31:06 +0000
@@ -16,54 +16,16 @@
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
--import QtQuick 2.0
--import Ubuntu.Components 0.1
++import QtQuick 2.2
++import Ubuntu.Components 1.1
  import ".."
  MMSBase {
      id: defaultDelegate
--    property var attachment
--    property bool incoming
--    property string previewer: ""
--    property string textColor: incoming ? "#333333" : "#ffffff"
++
      anchors.left: parent.left
      anchors.right: parent.right
--    onItemClicked: {
--        if (checkClick(bubble, mouse)) {
--            attachmentClicked()
--        }
--    }
--    state: incoming ? "incoming" : "outgoing"
--    states: [
--        State {
--            name: "incoming"
--            AnchorChanges {
--                target: bubble
--                anchors.left: parent.left
--                anchors.right: undefined
--            }
--            PropertyChanges {
--                target: bubble
--                anchors.leftMargin: units.gu(1)
--                anchors.rightMargin: units.gu(1)
--            }
--        },
--        State {
--            name: "outgoing"
--            AnchorChanges {
--                target: bubble
--                anchors.left: undefined
--                anchors.right: parent.right
--            }
--            PropertyChanges {
--                target: bubble
--                anchors.leftMargin: units.gu(1)
--                anchors.rightMargin: units.gu(1)
--            }
--        }
--    ]
      height: bubble.height + units.gu(1)
--    clip: true
      Item {
          id: bubble
          anchors.top: parent.top
 === modified file 'src/qml/MMS/MMSImage.qml'
 --- src/qml/MMS/MMSImage.qml	2014-07-31 19:01:23 +0000
 +++ src/qml/MMS/MMSImage.qml	2014-08-12 15:31:06 +0000
@@ -16,27 +16,19 @@
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
--import QtQuick 2.0
++import QtQuick 2.2
  import Ubuntu.Components 1.1
--import Ubuntu.Contacts 0.1
--import ".."
  MMSBase {
      id: imageDelegate
--    property string previewer: "MMS/PreviewerImage.qml"
--    onItemClicked: {
--        if (checkClick(bubble, mouse)) {
--            attachmentClicked()
--        }
--    }
++    previewer: "MMS/PreviewerImage.qml"
      height: imageAttachment.height
++    width: imageAttachment.width
++
      UbuntuShape {
          id: bubble
--        anchors {
--            top: parent.top
--            bottom: parent.bottom
--        }
++        anchors.top: parent.top
          width: image.width
          height: image.height
@@ -49,16 +41,42 @@
              smooth: true
              source: attachment.filePath
              visible: false
--        }
--    }
--
--    Loader {
--        active: (index == visibleAttachments-1) && !incoming && mmsText == "" && (inProgress || failed)
--        visible: active
--        height: active ? item.height : 0
--        sourceComponent: statusIcon
--        anchors.right: bubble.left
--        anchors.rightMargin: units.gu(1)
--        anchors.verticalCenter: bubble.verticalCenter
++            asynchronous: true
++
++            onStatusChanged:  {
++                if (status === Image.Error) {
++                    source = "image://theme/image-missing"
++                    width = 128
++                    height = 128
++                }
++            }
++        }
++
++        Rectangle {
++            visible: imageDelegate.lastItem
++            gradient: Gradient {
++                GradientStop { position: 0.0; color: "transparent" }
++                GradientStop { position: 1.0; color: "gray" }
++            }
++
++            anchors {
++                bottom: parent.bottom
++                left: parent.left
++                right: parent.right
++            }
++            height: units.gu(2)
++            radius: bubble.height * 0.1
++            Label {
++                anchors{
++                    left: parent.left
++                    bottom: parent.bottom
++                    leftMargin: incoming ? units.gu(2) : units.gu(1)
++                    bottomMargin: units.gu(0.5)
++                }
++                fontSize: "xx-small"
++                text: Qt.formatDateTime(timestamp, "hh:mm AP")
++                color: "white"
++            }
++        }
+     }
+ }
 === modified file 'src/qml/MMS/MMSVideo.qml'
 --- src/qml/MMS/MMSVideo.qml	2014-07-31 19:01:23 +0000
 +++ src/qml/MMS/MMSVideo.qml	2014-08-12 15:31:06 +0000
@@ -16,54 +16,19 @@
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
--import QtQuick 2.0
--import Ubuntu.Components 0.1
++import QtQuick 2.2
++import Ubuntu.Components 1.1
  import QtMultimedia 5.0
  import ".."
  MMSBase {
      id: videoDelegate
--    property var attachment
--    property bool incoming
--    property string previewer: "MMS/PreviewerVideo.qml"
++
++    previewer: "MMS/PreviewerVideo.qml"
      anchors.left: parent.left
      anchors.right: parent.right
--    onItemClicked: {
--        if (checkClick(bubble, mouse)) {
--            attachmentClicked()
--        }
--    }
--    state: incoming ? "incoming" : "outgoing"
--    states: [
--        State {
--            name: "incoming"
--            AnchorChanges {
--                target: bubble
--                anchors.left: parent.left
--                anchors.right: undefined
--            }
--            PropertyChanges {
--                target: bubble
--                anchors.leftMargin: units.gu(1)
--                anchors.rightMargin: units.gu(1)
--            }
--        },
--        State {
--            name: "outgoing"
--            AnchorChanges {
--                target: bubble
--                anchors.left: undefined
--                anchors.right: parent.right
--            }
--            PropertyChanges {
--                target: bubble
--                anchors.leftMargin: units.gu(1)
--                anchors.rightMargin: units.gu(1)
--            }
--        }
--    ]
      height: bubble.height + units.gu(1)
--    clip: true
++
      Item {
          id: bubble
          anchors.top: parent.top
 === modified file 'src/qml/MMS/Previewer.qml'
 --- src/qml/MMS/Previewer.qml	2014-06-13 19:39:49 +0000
 +++ src/qml/MMS/Previewer.qml	2014-08-12 15:31:06 +0000
@@ -16,8 +16,8 @@
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
--import QtQuick 2.0
--import Ubuntu.Components 0.1
++import QtQuick 2.2
++import Ubuntu.Components 1.1
  import Ubuntu.Content 0.1
  import ".."
 === modified file 'src/qml/MMS/PreviewerContact.qml'
 --- src/qml/MMS/PreviewerContact.qml	2014-07-30 18:23:16 +0000
 +++ src/qml/MMS/PreviewerContact.qml	2014-08-12 15:31:06 +0000
@@ -16,12 +16,14 @@
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
--import QtQuick 2.0
--import Ubuntu.Components 0.1
++import QtQuick 2.2
++import Ubuntu.Components 1.1
  import Ubuntu.Content 0.1
  import ".."
  Previewer {
--    title: application.contactNameFromVCard(attachment.filePath)
++    property string contactName: application.contactNameFromVCard(attachment.filePath)
++
++    title: contactName !== "" ? contactName : i18n.tr("Unknown contact")
      clip: true
+ }
 === modified file 'src/qml/MMS/PreviewerImage.qml'
 --- src/qml/MMS/PreviewerImage.qml	2014-06-13 19:39:49 +0000
 +++ src/qml/MMS/PreviewerImage.qml	2014-08-12 15:31:06 +0000
@@ -16,8 +16,8 @@
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
--import QtQuick 2.0
--import Ubuntu.Components 0.1
++import QtQuick 2.2
++import Ubuntu.Components 1.1
  import Ubuntu.Content 0.1
  import ".."
 === modified file 'src/qml/MMS/PreviewerVideo.qml'
 --- src/qml/MMS/PreviewerVideo.qml	2014-05-30 21:16:51 +0000
 +++ src/qml/MMS/PreviewerVideo.qml	2014-08-12 15:31:06 +0000
@@ -16,8 +16,8 @@
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
--import QtQuick 2.0
--import Ubuntu.Components 0.1
++import QtQuick 2.2
++import Ubuntu.Components 1.1
  import QtMultimedia 5.0
  import ".."
 === added file 'src/qml/MMSDelegate.qml'
 --- src/qml/MMSDelegate.qml	1970-01-01 00:00:00 +0000
 +++ src/qml/MMSDelegate.qml	2014-08-12 15:31:06 +0000
@@ -0,0 +1,198 @@
++/*
++ * Copyright 2012, 2013, 2014 Canonical Ltd.
++ *
++ * This file is part of messaging-app.
++ *
++ * messaging-app is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * messaging-app is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++import QtQuick 2.2
++import Ubuntu.Components 1.1
++
++MessageDelegate {
++    id: root
++
++    property var dataAttachments: []
++    property var textAttachements: []
++
++    function clicked(mouse)
++    {
++        var childPoint = root.mapToItem(attachmentsView, mouse.x, mouse.y)
++        var attachment = attachmentsView.childAt(childPoint.x, childPoint.y)
++        if (attachment && attachment.item && attachment.item.previewer) {
++            var properties = {}
++            properties["attachment"] = attachment.item.attachment
++            mainStack.push(Qt.resolvedUrl(attachment.item.previewer), properties)
++        }
++    }
++
++    function deleteMessage()
++    {
++        eventModel.removeEvent(accountId, threadId, eventId, type)
++    }
++
++    function resendMessage()
++    {
++        var newAttachments = []
++        for (var i = 0; i < attachments.length; i++) {
++            var attachment = []
++            var item = textMessageAttachments[i]
++            // we dont include smil files. they will be auto generated
++            if (item.contentType.toLowerCase() === "application/smil") {
++                continue
++            }
++            attachment.push(item.attachmentId)
++            attachment.push(item.contentType)
++            attachment.push(item.filePath)
++            newAttachments.push(attachment)
++        }
++        eventModel.removeEvent(accountId, threadId, eventId, type)
++        chatManager.sendMMS(participants, textMessage, newAttachments, messages.accountId)
++    }
++
++    function copyMessage()
++    {
++        if (bubble.visible) {
++            Clipboard.push(bubble.messageText)
++        }
++    }
++
++    onAttachmentsChanged: {
++        dataAttachments = []
++        textAttachements = []
++        for (var i=0; i < attachments.length; i++) {
++            var attachment = attachments[i]
++            if (startsWith(attachment.contentType, "text/plain") ) {
++                textAttachements.push(attachment)
++            } else if (startsWith(attachment.contentType, "image/")) {
++                dataAttachments.push({"type": "image",
++                                      "data": attachment,
++                                      "delegateSource": "MMS/MMSImage.qml",
++                                    })
++            } else if (startsWith(attachment.contentType, "video/")) {
++                        // TODO: implement proper video attachment support
++                        //                dataAttachments.push({type: "video",
++                        //                                  data: attachment,
++                        //                                  delegateSource: "MMS/MMSVideo.qml",
++                        //                                 })
++            } else if (startsWith(attachment.contentType, "application/smil") ||
++                       startsWith(attachment.contentType, "application/x-smil")) {
++                        // TODO: implement support for this kind of attachment
++                        //                dataAttachments.push({type: "application",
++                        //                                  data: attachment,
++                        //                                  delegateSource: "",
++                        //                                 })
++            } else if (startsWith(attachment.contentType, "text/vcard") ||
++                       startsWith(attachment.contentType, "text/x-vcard")) {
++                dataAttachments.push({"type": "vcard",
++                                      "data": attachment,
++                                      "delegateSource": "MMS/MMSContact.qml"
++                                    })
++            } else {
++                console.log("No MMS render for " + attachment.contentType)
++            }
++        }
++    }
++    height: attachmentsView.height
++    _lastItem: bubble.visible ? bubble : attachmentsRepeater.itemAt(attachmentsRepeater - 1)
++    Column {
++        id: attachmentsView
++
++        anchors {
++            top: parent.top
++            left: parent.left
++            right: parent.right
++        }
++        height: childrenRect.height
++
++        Repeater {
++            id: attachmentsRepeater
++            model: dataAttachments
++
++            Loader {
++                id: attachmentLoader
++                asynchronous: true
++                states: [
++                    State {
++                        when: root.incoming
++                        name: "incoming"
++                        AnchorChanges {
++                            target: attachmentLoader
++                            anchors.left: parent.left
++                        }
++                        PropertyChanges {
++                            target: attachmentLoader
++                            anchors.leftMargin: units.gu(1)
++                            anchors.rightMargin: 0
++                        }
++                    },
++                    State {
++                        when: !root.incoming
++                        name: "outgoing"
++                        AnchorChanges {
++                            target: attachmentLoader
++                            anchors.right: parent.right
++                        }
++                        PropertyChanges {
++                            target: attachmentLoader
++                            anchors.leftMargin: 0
++                            anchors.rightMargin: units.gu(1)
++                        }
++                    }
++                ]
++
++                Component.onCompleted: {
++                    var initialProperties = {
++                        "incoming": root.incoming,
++                        "attachment": modelData.data,
++                        "timestamp": timestamp,
++                        "lastItem": (index === (attachmentsRepeater.count - 1)) && (textAttachements.length === 0)
++                    }
++                    setSource(modelData.delegateSource, initialProperties)
++                }
++            }
++        }
++
++        // TODO: is possible to have more than one text ???
++        MessageBubble {
++            id: bubble
++
++            property string textData: application.readTextFile(root.textAttachements[0].filePath)
++
++            states: [
++                State {
++                    when: root.incoming
++                    name: "incoming"
++                    AnchorChanges {
++                        target: bubble
++                        anchors.left: parent.left
++                    }
++                },
++                State {
++                    name: "outgoing"
++                    when: !root.incoming
++                    AnchorChanges {
++                        target: bubble
++                        anchors.right: parent.right
++                    }
++                }
++            ]
++            visible: (root.textAttachements.length > 0)
++            messageText: textData.length > 0 ? textData : i18n.tr("Missing message data")
++            messageTimeStamp: root.timestamp
++            messageStatus: textMessageStatus
++            messageIncoming: root.incoming
++            accountName: root.accountLabel
++        }
++    }
++}
 === modified file 'src/qml/MainPage.qml'
 --- src/qml/MainPage.qml	2014-07-31 19:16:57 +0000
 +++ src/qml/MainPage.qml	2014-08-12 15:31:06 +0000
@@ -16,7 +16,7 @@
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
--import QtQuick 2.0
++import QtQuick 2.2
  import Ubuntu.Components 1.1
  import Ubuntu.Components.ListItems 0.1 as ListItem
  import Ubuntu.History 0.1
@@ -40,7 +40,7 @@
      bottomEdgePageComponent: Messages {
          active: false
+     }
--    bottomEdgeTitle: i18n.tr("New Chat")
++    bottomEdgeTitle: i18n.tr("Create new")
      TextField {
          id: searchField
@@ -114,6 +114,38 @@
+         }
+     ]
++    Item {
++        id: emptyStateScreen
++        anchors.left: parent.left
++        anchors.leftMargin: units.gu(6)
++        anchors.right: parent.right
++        anchors.rightMargin: units.gu(6)
++        height: childrenRect.height
++        anchors.verticalCenter: parent.verticalCenter
++        visible: threadCount == 0 && !threadModel.canFetchMore
++        Icon {
++            id: emptyStateIcon
++            anchors.top: emptyStateScreen.top
++            anchors.horizontalCenter: parent.horizontalCenter
++            height: units.gu(5)
++            width: height
++            opacity: 0.3
++            name: "message"
++        }
++        Label {
++            id: emptyStateLabel
++            anchors.top: emptyStateIcon.bottom
++            anchors.topMargin: units.gu(2)
++            anchors.left: parent.left
++            anchors.right: parent.right
++            text: i18n.tr("Compose a new message by swiping up from the bottom of the screen.")
++            color: "#5d5d5d"
++            fontSize: "x-large"
++            wrapMode: Text.WordWrap
++            horizontalAlignment: Text.AlignHCenter
++        }
++    }
++
      HistoryThreadGroupingProxyModel {
          id: sortProxy
          sortRole: HistoryThreadModel.LastEventTimestampRole
 === modified file 'src/qml/MessageBubble.qml'
 --- src/qml/MessageBubble.qml	2014-08-01 02:36:29 +0000
 +++ src/qml/MessageBubble.qml	2014-08-12 15:31:06 +0000
@@ -27,15 +27,16 @@
      id: root
      property int messageStatus: -1
--    property bool incoming: false
++    property bool messageIncoming: false
      property alias sender: senderName.text
      property string messageText
      property var messageTimeStamp
--    property int maxDelegateWidth: units.gu(30)
++    property int maxDelegateWidth: units.gu(27)
++    property string accountName
      readonly property bool error: (messageStatus === HistoryThreadModel.MessageStatusPermanentlyFailed)
      readonly property bool sending: (messageStatus === HistoryThreadModel.MessageStatusUnknown ||
--                                     messageStatus === HistoryThreadModel.MessageStatusTemporarilyFailed) && !incoming
++                                     messageStatus === HistoryThreadModel.MessageStatusTemporarilyFailed) && !messageIncoming
      function selectBubble() {
          var fileName = "assets/conversation_";
@@ -43,7 +44,7 @@
              fileName += "error.sci"
          } else if (sending) {
              fileName += "pending.sci"
--        } else if (incoming) {
++        } else if (messageIncoming) {
              fileName += "incoming.sci";
          } else {
              fileName += "outgoing.sci";
@@ -63,11 +64,11 @@
          return text.replace(phoneExp, '<a href="tel:///$1">$1</a>');
+     }
--    onIncomingChanged: source = selectBubble()
++    onMessageIncomingChanged: source = selectBubble()
      source: selectBubble()
--    height: childrenRect.height + units.gu(2)
++    height: senderName.height + textLabel.height + textTimestamp.height + units.gu(3)
      width:  Math.min(units.gu(27),
--                     Math.max(textLabel.text.length, textTimestamp.text.length) * units.gu(1))
++                     Math.max(textLabel.contentWidth, textTimestamp.contentWidth))
              + border.left + border.right
      Label {
          id: senderName
@@ -76,7 +77,7 @@
              top: parent.top
              topMargin: units.gu(1)
              left: parent.left
--            leftMargin: incoming ? units.gu(2) : units.gu(1)
++            leftMargin: root.messageIncoming ? units.gu(2) : units.gu(1)
+         }
          height: text === "" ? 0 : paintedHeight
          fontSize: "large"
@@ -91,17 +92,15 @@
              top: sender == "" ? parent.top : senderName.bottom
              topMargin: units.gu(1)
              left: parent.left
--            leftMargin: incoming ? units.gu(2) : units.gu(1)
--            right: parent.right
--            rightMargin: incoming ? units.gu(1) : units.gu(1)
++            leftMargin: root.messageIncoming ? units.gu(2) : units.gu(1)
+         }
          width: maxDelegateWidth
          fontSize: "medium"
--        height: text === "" ? 0 : paintedHeight
++        height: contentHeight
          onLinkActivated:  Qt.openUrlExternally(link)
          text: root.parseText(messageText)
          wrapMode: Text.Wrap
--        color: root.incoming ? UbuntuColors.darkGrey : "white"
++        color: root.messageIncoming ? UbuntuColors.darkGrey : "white"
+     }
      Label {
@@ -110,16 +109,25 @@
          anchors{
              top: textLabel.bottom
--            topMargin: units.gu(0.5)
++            topMargin: units.gu(1)
              left: parent.left
--            leftMargin: incoming ? units.gu(2) : units.gu(1)
++            leftMargin: root.messageIncoming ? units.gu(2) : units.gu(1)
+         }
          visible: !root.sending
--        height: visible ? paintedHeight : 0
++        height: units.gu(2)
++        width: visible ? maxDelegateWidth : 0
          fontSize: "xx-small"
--        color: root.incoming ? UbuntuColors.lightGrey : "white"
--        opacity: root.incoming ? 1.0 : 0.8
--        text: Qt.formatDateTime(messageTimeStamp, "hh:mm AP")
++        color: root.messageIncoming ? UbuntuColors.lightGrey : "white"
++        opacity: root.messageIncoming ? 1.0 : 0.8
++        elide: Text.ElideRight
++        text: {
++            var str = Qt.formatDateTime(messageTimeStamp, "hh:mm AP")
++            if (root.accountName.length === 0) {
++                return str
++            }
++            str += " @ %1".arg(root.accountName)
++            return str
++        }
+     }
+ }
 === added file 'src/qml/MessageDateSection.qml'
 --- src/qml/MessageDateSection.qml	1970-01-01 00:00:00 +0000
 +++ src/qml/MessageDateSection.qml	2014-08-12 15:31:06 +0000
@@ -0,0 +1,38 @@
++/*
++ * Copyright 2012, 2013, 2014 Canonical Ltd.
++ *
++ * This file is part of messaging-app.
++ *
++ * messaging-app is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * messaging-app is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++import QtQuick 2.2
++import Ubuntu.Components 1.1
++import Ubuntu.Components.ListItems 0.1 as ListItem
++
++Item {
++    property alias text: label.text
++
++    height: units.gu(3)
++    Label {
++        id: label
++
++        anchors.fill: parent
++        elide: Text.ElideRight
++        verticalAlignment: Text.AlignVCenter
++        fontSize: "small"
++    }
++    ListItem.ThinDivider {
++        anchors.bottom: parent.bottom
++    }
++}
 === modified file 'src/qml/MessageDelegate.qml'
 --- src/qml/MessageDelegate.qml	2014-07-31 19:58:54 +0000
 +++ src/qml/MessageDelegate.qml	2014-08-12 15:31:06 +0000
@@ -16,242 +16,46 @@
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
--import QtQuick 2.0
--import Ubuntu.Components 1.1
--import Ubuntu.Components.Popups 0.1
--import Ubuntu.History 0.1
--import Ubuntu.Telephony 0.1
--import Ubuntu.Content 0.1
--import Ubuntu.Contacts 0.1
--
--import "dateUtils.js" as DateUtils
++import QtQuick 2.2
  Item {
      id: messageDelegate
--
--    property alias incoming: bubble.incoming
--    property string textColor: incoming ? "#333333" : "white"
--    property bool unread: false
--    property variant activeAttachment
--    property string mmsText: ""
--    property string mmsTextId: ""
--    property string accountLabel: ""
--    property bool selectionMode: false
--    property bool selected: false
--    property bool inProgress: (textMessageStatus === HistoryThreadModel.MessageStatusUnknown ||
--                               textMessageStatus === HistoryThreadModel.MessageStatusTemporarilyFailed)
--    property bool failed: (textMessageStatus === HistoryThreadModel.MessageStatusPermanentlyFailed)
--    property int visibleAttachments: 0
--
--    signal resend()
--    signal itemPressAndHold(QtObject obj)
--    signal itemClicked(QtObject obj)
--
--    anchors {
--        left: parent ? parent.left : undefined
--        right: parent ? parent.right: undefined
--    }
--    height: attachments.height + bubbleItem.height
--
--    Component {
--        id: statusIcon
--        Item {
--            height: units.gu(4)
--            width: units.gu(4)
--            visible: !incoming && !messageDelegate.selectionMode
--            ActivityIndicator {
--                id: indicator
--
--                anchors.centerIn: parent
--                height: units.gu(2)
--                width: units.gu(2)
--                visible: running && !selectionMode
--                // if temporarily failed or unknown status, then show the spinner
--                running: inProgress
--            }
--
--            Item {
--                id: retrybutton
--
--                anchors.fill: parent
--                Icon {
--                    id: icon
--
--                    name: "reload"
--                    color: "red"
--                    height: units.gu(2)
--                    width: units.gu(2)
--                    anchors {
--                        centerIn: parent
--                        verticalCenterOffset: units.gu(-1)
--                    }
--                }
--
--                Label {
--                    text: i18n.tr("Failed!")
--                    fontSize: "small"
--                    color: "red"
--                    anchors {
--                        horizontalCenter: retrybutton.horizontalCenter
--                        top: icon.bottom
--                    }
--                }
--                visible: failed
--                MouseArea {
--                    id: retrybuttonMouseArea
--
--                    anchors.fill: parent
--                    onClicked: messageDelegate.resend()
--                }
--            }
--        }
--    }
--
--    Column {
--        id: attachments
--        anchors {
--            top: parent.top
--            left: parent.left
--            right: parent.right
--        }
--        height: childrenRect.height
--        Repeater {
--            id: attachmentsRepeater
--
--            model: textMessageAttachments
--            Loader {
--                anchors {
--                    left: parent ? parent.left : undefined
--                    right: parent ? parent.right : undefined
--                }
--                height: item ? item.height : 0
--                source: {
--                    if (startsWith(modelData.contentType, "image/")) {
--                        return "MMS/MMSImage.qml"
--                    } else if (startsWith(modelData.contentType, "video/")) {
--                        return "MMS/MMSVideo.qml"
--                    } else if (startsWith(modelData.contentType, "application/smil") ||
--                              startsWith(modelData.contentType, "application/x-smil")) {
--                        return ""
--                    } else if (startsWith(modelData.contentType, "text/plain") ) {
--                        mmsText = application.readTextFile(modelData.filePath)
--                        mmsTextId = modelData.attachmentId
--                        return ""
--                    } else if (startsWith(modelData.contentType, "text/vcard") ||
--                              startsWith(modelData.contentType, "text/x-vcard")) {
--                        return "MMS/MMSContact.qml"
--                    } else {
--                        console.log("No MMS render for " + modelData.contentType)
--                        return "MMS/MMSDefault.qml"
--                    }
--                }
--                onStatusChanged: {
--                    if (status == Loader.Ready) {
--                        item.attachment = modelData
--                        item.incoming = incoming
--                    }
--                }
--                Connections {
--                    target: item
--                    onItemRemoved: {
--                        eventModel.removeEventAttachment(accountId, threadId, eventId, type, modelData.attachmentId)
--                        if (visibleAttachments == 1 && mmsText === "") {
--                            // this is the last attachment. remove the whole event
--                            eventModel.removeEvent(accountId, threadId, eventId, type)
--                            return
--                        }
--                    }
--                }
--                Connections {
--                    target: item
--                    onItemPressAndHold: itemPressAndHold(bubbleItem)
--                }
--                Binding {
--                    target: item
--                    property: "parentSelected"
--                    value: messageDelegate.selected
--                }
--                Connections {
--                    target: item
--                    onAttachmentClicked: {
--                        if (item.previewer === "") {
--                            activeAttachment = modelData
--                            PopupUtils.open(popoverSaveAttachmentComponent, item)
--                            return
--                        }
--
--                        var properties = {}
--                        properties["attachment"] = item.attachment
--                        mainStack.push(Qt.resolvedUrl(item.previewer), properties)
--                    }
--                }
--            }
--        }
--    }
--
--    ListItemWithActions {
--        id: bubbleItem
--
--        anchors {
--            top: attachments.bottom
--            left: parent.left
--            right: parent.right
--        }
--        internalAnchors {
--            topMargin: 0
--            bottomMargin: 0
--        }
--
--        height: bubble.visible ? bubble.height  : 0
--        leftSideAction: Action {
--            iconName: "delete"
--            text: i18n.tr("Delete")
--            onTriggered: {
--                // if there are no attachments, remove the whole message
--                if (visibleAttachments == 0) {
--                    eventModel.removeEvent(accountId, threadId, eventId, type)
--                    return
--                }
--                // check if this is an mms text and we have more attachments
--                if (mmsText !== "" && visibleAttachments > 1) {
--                    // remove only the text attachment if we have more attachments
--                    eventModel.removeEventAttachment(accountId, threadId, eventId, type, mmsTextId)
--                    mmsText = ""
--                    mmsTextId = ""
--                    return
--                }
--            }
--        }
--
--        selected: messageDelegate.selected
--        selectionMode: messageDelegate.selectionMode
--        onItemPressAndHold: messageDelegate.itemPressAndHold(bubbleItem)
--        onItemClicked: messageDelegate.itemClicked(bubbleItem)
--        onSwippingChanged: messageList.updateSwippedItem(bubbleItem)
--        onSwipeStateChanged: messageList.updateSwippedItem(bubbleItem)
--
--        MessageBubble {
--            id: bubble
--
--            anchors {
--                top: parent.top
--                left: incoming ? parent.left : undefined
--                right: incoming ? undefined : parent.right
--            }
--            visible: (messageText !== "")
--            messageText: textMessage !== "" ? textMessage : mmsText
--            messageTimeStamp: timestamp
--            messageStatus: textMessageStatus
--        }
--
--        Loader {
--            id: statusIconLoader
--            active: !incoming && !messageDelegate.selectionMode && bubble.visible && (inProgress || failed)
--            sourceComponent: statusIcon
--            anchors.right: bubble.left
--            anchors.rightMargin: units.gu(1)
--            anchors.verticalCenter: bubble.verticalCenter
--        }
--    }
--
++    objectName: "messageDelegate"
++
++    property bool incoming
++    property var attachments
++    property string accountId
++    property var threadId
++    property var eventId
++    property var type
++    property string text
++    property var timestamp
++    property string accountLabel
++    property var _lastItem: messageDelegate
++
++
++    function deleteMessage()
++    {
++        //virtual implemented by each Message type
++    }
++
++    function copyMessage()
++    {
++        //virtual implemented by each Message type
++    }
++
++    function resendMessage()
++    {
++        //virtual implemented by each Message type
++    }
++
++    function showMessageDetails(mouse)
++    {
++        //virtual implemented by each Message type
++    }
++
++    function clicked(mouse)
++    {
++        //virtual implemented by each Message type
++    }
+ }
 === added file 'src/qml/MessageDelegateFactory.qml'
 --- src/qml/MessageDelegateFactory.qml	1970-01-01 00:00:00 +0000
 +++ src/qml/MessageDelegateFactory.qml	2014-08-12 15:31:06 +0000
@@ -0,0 +1,203 @@
++/*
++ * Copyright 2012, 2013, 2014 Canonical Ltd.
++ *
++ * This file is part of messaging-app.
++ *
++ * messaging-app is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * messaging-app is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++import QtQuick 2.2
++import Ubuntu.Components 1.1
++import Ubuntu.Contacts 0.1
++import Ubuntu.History 0.1
++
++ListItemWithActions {
++    id: root
++
++    property bool incoming: false
++    property var _lastItem: loader.status === Loader.Ready ? loader.item._lastItem : null
++    property list<Action> _availableActions
++    property string accountLabel
++
++    signal deleteMessage()
++    signal resendMessage()
++    signal copyMessage()
++    signal showMessageDetails()
++
++    triggerActionOnMouseRelease: true
++    width: messageList.width
++    leftSideAction: Action {
++        iconName: "delete"
++        text: i18n.tr("Delete")
++        onTriggered: deleteMessage()
++    }
++
++    // WORKAROUND: to filter actions on rightSideActions property based on message status
++    _availableActions: [
++        Action {
++            id: reloadAction
++
++            iconName: "reload"
++            text: i18n.tr("Retry")
++            onTriggered: resendMessage()
++        },
++        Action {
++            id: copyAction
++
++            iconName: "edit-copy"
++            text: i18n.tr("Copy")
++            onTriggered: copyMessage()
++        },
++        Action {
++            id: infoAction
++
++            iconName: "info"
++            text: i18n.tr("Info")
++            onTriggered: {
++                // FIXME: Is that the corect way to do that?
++                var messageType = textMessageAttachments.length > 0 ? i18n.tr("MMS") : i18n.tr("SMS")
++                var messageInfo = {"type": messageType,
++                                   "senderId": senderId,
++                                   "timestamp": timestamp,
++                                   "textReadTimestamp": textReadTimestamp,
++                                   "status": textMessageStatus}
++                messageInfoDialog.showMessageInfo(messageInfo)
++            }
++        }
++    ]
++
++    rightSideActions: {
++        var actions = []
++        if (textMessageStatus === HistoryThreadModel.MessageStatusPermanentlyFailed) {
++            actions.push(reloadAction)
++        }
++        actions.push(copyAction)
++        actions.push(infoAction)
++        return actions
++    }
++
++    height: loader.height + units.gu(1)
++    internalAnchors {
++        topMargin: units.gu(0.5)
++        bottomMargin: units.gu(0.5)
++    }
++
++    onItemClicked: {
++        if (!selectionMode && (loader.status === Loader.Ready)) {
++            loader.item.clicked(mouse)
++        }
++    }
++
++    Loader {
++        id: loader
++
++        onStatusChanged:  {
++            if (status === Loader.Ready) {
++                //signals
++                root.resendMessage.connect(item.resendMessage)
++                root.deleteMessage.connect(item.deleteMessage)
++                root.copyMessage.connect(item.copyMessage)
++                root.showMessageDetails(item.showMessageDetails)
++            }
++        }
++        anchors {
++            left: parent.left
++            right: parent.right
++        }
++        height: status == Loader.Ready ? item.height : 0
++        Component.onCompleted: {
++            var initialProperties = {
++                "incoming": root.incoming,
++                "accountLabel": accountLabel,
++                "attachments": textMessageAttachments,
++                "accountId": accountId,
++                "threadId": threadId,
++                "eventId": eventId,
++                "type": type,
++                "text": textMessage,
++                "timestamp": timestamp
++            }
++            if (textMessageAttachments.length > 0) {
++                setSource(Qt.resolvedUrl("MMSDelegate.qml"), initialProperties)
++            } else {
++                setSource(Qt.resolvedUrl("SMSDelegate.qml"), initialProperties)
++            }
++        }
++    }
++
++    Item {
++        id: statusIcon
++
++        height: units.gu(4)
++        width: units.gu(4)
++        parent: _lastItem
++        anchors {
++            verticalCenter: parent ? parent.verticalCenter : undefined
++            right: parent ? parent.left : undefined
++            rightMargin: units.gu(2)
++        }
++
++        visible: !incoming && !selectionMode
++        ActivityIndicator {
++            id: indicator
++
++            anchors.centerIn: parent
++            height: units.gu(2)
++            width: units.gu(2)
++            visible: running && !selectionMode
++            // if temporarily failed or unknown status, then show the spinner
++            running: (textMessageStatus === HistoryThreadModel.MessageStatusUnknown ||
++                      textMessageStatus === HistoryThreadModel.MessageStatusTemporarilyFailed)
++        }
++
++        Item {
++            id: retrybutton
++
++            anchors.fill: parent
++            Icon {
++                id: icon
++
++                name: "reload"
++                color: "red"
++                height: units.gu(2)
++                width: units.gu(2)
++                anchors {
++                    centerIn: parent
++                    verticalCenterOffset: units.gu(-1)
++                }
++            }
++
++            Label {
++                text: i18n.tr("Failed!")
++                fontSize: "small"
++                color: "red"
++                anchors {
++                    horizontalCenter: retrybutton.horizontalCenter
++                    top: icon.bottom
++                }
++            }
++            visible: (textMessageStatus === HistoryThreadModel.MessageStatusPermanentlyFailed)
++            MouseArea {
++                id: retrybuttonMouseArea
++
++                anchors.fill: parent
++                onClicked: root.resendMessage()
++            }
++        }
++
++
++        MessageInfoDialog {
++            id: messageInfoDialog
++        }
++    }
++}
 === added file 'src/qml/MessageInfoDialog.qml'
 --- src/qml/MessageInfoDialog.qml	1970-01-01 00:00:00 +0000
 +++ src/qml/MessageInfoDialog.qml	2014-08-12 15:31:06 +0000
@@ -0,0 +1,124 @@
++/*
++ * Copyright 2012, 2013, 2014 Canonical Ltd.
++ *
++ * This file is part of messaging-app.
++ *
++ * messaging-app is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * messaging-app is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++import QtQuick 2.2
++import Ubuntu.Components 1.1
++import Ubuntu.Components.Popups 0.1
++import Ubuntu.History 0.1
++
++
++Item {
++    id: root
++
++    property QtObject activeDialog: null
++    property var activeMessage: null
++
++    function showMessageInfo(message)
++    {
++        if (!activeDialog) {
++            activeMessage = message
++            activeDialog = PopupUtils.open(messageInfoDialog, messages)
++        }
++    }
++
++    Component {
++        id: messageInfoDialog
++
++        Dialog {
++            id: dialogue
++
++            parent: messages
++
++            function statusToString(status)
++            {
++                switch(status)
++                {
++                case HistoryThreadModel.MessageStatusDelivered:
++                    return i18n.tr("Delivered")
++                case HistoryThreadModel.MessageStatusTemporarilyFailed:
++                    return i18n.tr("Temporarily Failed")
++                case HistoryThreadModel.MessageStatusPermanentlyFailed:
++                    return i18n.tr("Failed")
++                case HistoryThreadModel.MessageStatusAccepted:
++                    return i18n.tr("Accepted")
++                case HistoryThreadModel.MessageStatusRead:
++                    return i18n.tr("Read")
++                case HistoryThreadModel.MessageStatusDeleted:
++                    return i18n.tr("Deleted")
++                case HistoryThreadModel.MessageStatusPending:
++                    return i18n.tr("Pending")
++                case HistoryThreadModel.MessageStatusUnknown:
++                    //FIXME: Received messages has Unknown status is that correct??
++                    if (root.activeMessage.senderId !== "self") {
++                        return i18n.tr("Received")
++                    } else {
++                        return i18n.tr("Unknown")
++                    }
++                default:
++                    return i18n.tr("Unknown")
++                }
++            }
++
++
++            title: i18n.tr("Message info")
++
++            anchors.centerIn: parent
++            height: childrenRect.height
++            width: childrenRect.width
++
++            Label {
++                text: "<b>%1:</b> %2".arg(i18n.tr("Type")).arg(root.activeMessage.type)
++            }
++
++            Label {
++                text: "<b>%1:</b> %2".arg(i18n.tr("From")).arg(root.activeMessage.senderId !== "self" ? root.activeMessage.senderId : i18n.tr("Myself"))
++            }
++
++            Label {
++                text: "<b>%1:</b> %2".arg(i18n.tr("Sent")).arg(Qt.formatDateTime(root.activeMessage.timestamp, Qt.DefaultLocaleShortDate))
++                visible: (root.activeMessage.senderId === "self")
++            }
++
++            Label {
++                text: "<b>%1:</b> %2".arg(i18n.tr("Received")).arg(Qt.formatDateTime(root.activeMessage.timestamp, Qt.DefaultLocaleShortDate))
++                visible: (root.activeMessage.senderId !== "self")
++            }
++
++            Label {
++                text: "<b>%1:</b> %2".arg(i18n.tr("Read")).arg(Qt.formatDateTime(root.activeMessage.textReadTimestamp, Qt.DefaultLocaleShortDate))
++                visible: (root.activeMessage.senderId !== "self") && (root.activeMessage.textReadTimestamp > 0)
++            }
++
++            Label {
++                text: "<b>%1:</b> %2".arg(i18n.tr("Status")).arg(statusToString(root.activeMessage.status))
++            }
++
++            Button {
++                text: i18n.tr("Close")
++                onClicked: {
++                    PopupUtils.close(root.activeDialog)
++                }
++            }
++
++            Component.onDestruction: {
++                root.activeDialog = null
++                root.activeMessage = null
++            }
++        }
++    }
++}
 === modified file 'src/qml/Messages.qml'
 --- src/qml/Messages.qml	2014-07-31 20:21:52 +0000
 +++ src/qml/Messages.qml	2014-08-12 15:31:06 +0000
@@ -16,7 +16,7 @@
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
--import QtQuick 2.0
++import QtQuick 2.2
  import QtQuick.Window 2.0
  import QtContacts 5.0
  import Ubuntu.Components 1.1
@@ -28,11 +28,16 @@
  import Ubuntu.Contacts 0.1
  import QtContacts 5.0
++import "dateUtils.js" as DateUtils
++
  Page {
      id: messages
      objectName: "messagesPage"
--    property QtObject account: telepathyHelper.accounts[0]
--    property bool multipleAccounts: telepathyHelper.accounts.length > 1
++
++    // this property can be overriden by the user using the account switcher,
++    // in the suru divider
++    property QtObject account: mainView.defaultAccount
++
      property variant participants: []
      property bool groupChat: participants.length > 1
      property bool keyboardFocus: true
@@ -40,7 +45,6 @@
      // FIXME: MainView should provide if the view is in portait or landscape
      property int orientationAngle: Screen.angleBetween(Screen.primaryOrientation, Screen.orientation)
      property bool landscape: orientationAngle == 90 || orientationAngle == 270
--    property bool pendingMessage: false
      property var activeTransfer: null
      property int activeAttachmentIndex: -1
      property var sharedAttachmentsTransfer: []
@@ -72,6 +76,13 @@
          return messages.account.connected;
+     }
++    // this is necessary to automatically update the view when the
++    // default account changes in system settings
++    Connections {
++        target: mainView
++        onDefaultAccountChanged: account = mainView.defaultAccount
++    }
++
      ListModel {
          id: attachments
+     }
@@ -103,7 +114,7 @@
      title: {
          if (selectionMode) {
--            return i18n.tr("Edit")
++            return i18n.tr(" ")
+         }
          if (landscape) {
@@ -119,7 +130,7 @@
              if (participants.length == 1) {
                  return firstRecipient
              } else {
--                return i18n.tr("Group (%1 members)").arg(participants.length)
++                return i18n.tr("Group (%1)").arg(participants.length)
+             }
+         }
          return i18n.tr("New Message")
@@ -256,12 +267,20 @@
+         }
          return accountNames
+     }
--    head.sections.selectedIndex: Math.max(0, telepathyHelper.accounts.indexOf(messages.account))
++    head.sections.selectedIndex: {
++        if (!messages.account) {
++            return -1
++        }
++        for (var i in telepathyHelper.accounts) {
++            if (telepathyHelper.accounts[i].accountId === messages.account.accountId) {
++                return i
++            }
++        }
++        return -1
++    }
      Connections {
          target: messages.head.sections
--        onSelectedIndexChanged: {
--            messages.account = telepathyHelper.accounts[head.sections.selectedIndex]
--        }
++        onSelectedIndexChanged: messages.account = telepathyHelper.accounts[head.sections.selectedIndex]
+     }
      Component {
@@ -277,30 +296,13 @@
              filterTerm: multiRecipient.searchString
              showSections: false
              autoHideKeyboard: false
--
--            states: [
--                State {
--                    name: "empty"
--                    when: contactSearch.count === 0
--                    PropertyChanges {
--                        target: contactSearch
--                        height: 0
--                    }
--                }
--            ]
--
              anchors {
                  top: parent.top
                  topMargin: units.gu(1)
                  left: parent.left
                  right: parent.right
--                bottom: bottomPanel.top
--            }
--
--            Behavior on height {
--                UbuntuNumberAnimation { }
--            }
--
++                bottom: parent.bottom
++            }
              InvalidFilter {
                  id: invalidFilter
+             }
@@ -359,7 +361,7 @@
+                                     }
                                      height: units.gu(2)
                                      text: {
--                                        // this is necessary to keep the string in the original format
++                                        // this is necessary to keep the string in the original foverdrawormat
                                          var originalText = contact.displayLabel.label
                                          var lowerSearchText =  multiRecipient.searchString.toLowerCase()
                                          var lowerText = originalText.toLowerCase()
@@ -404,16 +406,27 @@
+     }
      Loader {
--        active: multiRecipient.searchString !== "" && multiRecipient.focus
--        sourceComponent: contactSearchComponent
++        property int resultCount: (status === Loader.Ready) ? item.view.count : 0
++
++        sourceComponent: (multiRecipient.searchString !== "") && multiRecipient.focus ? contactSearchComponent : null
          clip: true
          anchors {
              top: parent.top
              left: parent.left
              right: parent.right
--            bottom: bottomPanel.top
+         }
++        height: resultCount > 0 ? parent.height - keyboard.height : 0
          z: 1
++        // WORKAROUND: we need to use opacity here visible FALSE cause the item to not load
++        opacity: height > 0 ? 1.0 : 0.0
++        Behavior on height {
++            UbuntuNumberAnimation { }
++        }
++
++        Rectangle {
++            anchors.fill: parent
++            color: Theme.palette.normal.background
++        }
+     }
      ContactWatcher {
@@ -470,7 +483,13 @@
                  Action {
                      objectName: "selectionModeSelectAllAction"
                      iconName: "select"
--                    onTriggered: messageList.selectAll()
++                    onTriggered: {
++                        if (messageList.selectedItems.count === messageList.count) {
++                            messageList.clearSelection()
++                        } else {
++                            messageList.selectAll()
++                        }
++                    }
                  },
                  Action {
                      objectName: "selectionModeDeleteAction"
@@ -627,86 +646,66 @@
          header: Item {
              height: units.gu(1)
+         }
--
--        spacing: units.gu(1)
          listModel: participants.length > 0 ? sortProxy : null
          verticalLayoutDirection: ListView.BottomToTop
--        highlightFollowsCurrentItem: false
--        /*add: Transition {
--            UbuntuNumberAnimation {
--                properties: "anchors.leftMargin"
--                from: -width
--                to: 0
--            }
--            UbuntuNumberAnimation {
--                properties: "anchors.rightMargin"
--                from: -width
--                to: 0
--            }
--        }*/
++        highlightFollowsCurrentItem: true
++        currentIndex: 0
++        // keep the last item as currentItem
--        listDelegate: MessageDelegate {
++        listDelegate: Column {
              id: messageDelegate
--            objectName: "message%1".arg(index)
--            incoming: senderId != "self"
--            // TODO: we have several items inside
--            selected: messageList.isSelected(messageDelegate)
--            unread: newEvent
--            selectionMode: messages.selectionMode
--            accountLabel: multipleAccounts ? telepathyHelper.accountForId(accountId).displayName : ""
--            // TODO: need select only the item
--            onItemClicked: {
--                if (messageList.isInSelectionMode) {
--                    if (!messageList.selectItem(messageDelegate)) {
--                        messageList.deselectItem(messageDelegate)
--                    }
--                }
--            }
--            onItemPressAndHold: {
--                messageList.startSelection()
--                messageList.selectItem(messageDelegate)
--            }
--
--            Component.onCompleted: {
--                if (newEvent) {
--                    messages.markMessageAsRead(accountId, threadId, eventId, type);
--                }
--            }
--            onResend: {
--                // resend this message and remove the old one
--                if (textMessageAttachments.length > 0) {
--                    var newAttachments = []
--                    for (var i = 0; i < textMessageAttachments.length; i++) {
--                        var attachment = []
--                        var item = textMessageAttachments[i]
--                        // we dont include smil files. they will be auto generated
--                        if (item.contentType.toLowerCase() == "application/smil") {
--                            continue
++
++            // WORKAROUND: we can not use sections because the verticalLayoutDirection is ListView.BottomToTop the sections will appear
++            // bellow the item
++            MessageDateSection {
++                text: DateUtils.friendlyDay(timestamp)
++                anchors {
++                    left: parent.left
++                    right: parent.right
++                    leftMargin: units.gu(2)
++                    rightMargin: units.gu(2)
++                }
++                visible: (index === messageList.count) || !DateUtils.areSameDay(sortProxy.get(index+1).timestamp, timestamp)
++            }
++
++            MessageDelegateFactory {
++                objectName: "message%1".arg(index)
++                incoming: senderId != "self"
++                // TODO: we have several items inside
++                selected: messageList.isSelected(messageDelegate)
++                selectionMode: messages.selectionMode
++                accountLabel: multipleAccounts ? telepathyHelper.accountForId(accountId).displayName : ""
++                // TODO: need select only the item
++                onItemClicked: {
++                    if (messageList.isInSelectionMode) {
++                        if (!messageList.selectItem(messageDelegate)) {
++                            messageList.deselectItem(messageDelegate)
+                         }
--                        attachment.push(item.attachmentId)
--                        attachment.push(item.contentType)
--                        attachment.push(item.filePath)
--                        newAttachments.push(attachment)
--                    }
--                    eventModel.removeEvent(accountId, threadId, eventId, type)
--                    chatManager.sendMMS(participants, textMessage, newAttachments, messages.account.accountId)
--                    return
--                }
--                eventModel.removeEvent(accountId, threadId, eventId, type)
--                chatManager.sendMessage(messages.participants, textMessage, messages.account.accountId)
++                    }
++                }
++                onItemPressAndHold: {
++                    messageList.startSelection()
++                    messageList.selectItem(messageDelegate)
++                }
++
++                Component.onCompleted: {
++                    if (newEvent) {
++                        messages.markMessageAsRead(accountId, threadId, eventId, type);
++                    }
++                }
+             }
+         }
++
          onSelectionDone: {
              for (var i=0; i < items.count; i++) {
                  var event = items.get(i).model
                  eventModel.removeEvent(event.accountId, event.threadId, event.eventId, event.type)
+             }
+         }
++
          onCountChanged: {
--            if (messages.pendingMessage) {
--                messageList.contentY = 0
--                messages.pendingMessage = false
--            }
++            currentIndex = 0
++            positionViewAtBeginning()
+         }
+     }
@@ -891,7 +890,7 @@
                  height: units.gu(4.3)
                  style: MultiRecipientFieldStyle {}
                  autoSize: true
--                maximumLineCount: 0
++                maximumLineCount: attachments.count == 0 ? 8 : 4
                  placeholderText: i18n.tr("Write a message...")
                  focus: textEntry.focus
                  font.family: "Ubuntu"
@@ -935,20 +934,25 @@
                  return false
+             }
              onClicked: {
++                // check if at least one account is selected
++                if (!messages.account) {
++                    Qt.inputMethod.hide()
++                    PopupUtils.open(Qt.createComponent("Dialogs/NoSIMCardSelectedDialog.qml").createObject(messages))
++                    return
++                }
                  if (!checkNetwork()) {
                      Qt.inputMethod.hide()
                      PopupUtils.open(noNetworkDialog)
                      return
+                 }
++                if (multipleAccounts && !telepathyHelper.defaultMessagingAccount && !settings.messagesDontAsk) {
++                    PopupUtils.open(Qt.createComponent("Dialogs/SetDefaultSIMCardDialog.qml").createObject(messages))
++                }
                  // make sure we flush everything we have prepared in the OSK preedit
                  Qt.inputMethod.commit();
                  if (textEntry.text == "" && attachments.count == 0) {
                      return
+                 }
--                if (!messages.account) {
--                    // FIXME: handle dual sim
--                    messages.account = telepathyHelper.accounts[0]
--                }
                  // dont change the participants list
                  if (participants.length == 0) {
                      participants = multiRecipient.recipients
@@ -961,7 +965,6 @@
                                                     true)
                  updateFilters()
--                messages.pendingMessage = true
                  if (attachments.count > 0) {
                      var newAttachments = []
                      for (var i = 0; i < attachments.count; i++) {
 === modified file 'src/qml/MultiRecipientInput.qml'
 --- src/qml/MultiRecipientInput.qml	2014-07-30 16:19:08 +0000
 +++ src/qml/MultiRecipientInput.qml	2014-08-12 15:31:06 +0000
@@ -16,7 +16,7 @@
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
--import QtQuick 2.0
++import QtQuick 2.2
  import Ubuntu.Components 1.1
  import Ubuntu.Contacts 0.1
  import Ubuntu.Telephony 0.1
 === modified file 'src/qml/NewRecipientPage.qml'
 --- src/qml/NewRecipientPage.qml	2014-08-01 14:51:29 +0000
 +++ src/qml/NewRecipientPage.qml	2014-08-12 15:31:06 +0000
@@ -16,7 +16,7 @@
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
--import QtQuick 2.0
++import QtQuick 2.2
  import Ubuntu.Components 1.1
  import Ubuntu.Contacts 0.1
  import QtContacts 5.0
 === added file 'src/qml/SMSDelegate.qml'
 --- src/qml/SMSDelegate.qml	1970-01-01 00:00:00 +0000
 +++ src/qml/SMSDelegate.qml	2014-08-12 15:31:06 +0000
@@ -0,0 +1,75 @@
++/*
++ * Copyright 2012, 2013, 2014 Canonical Ltd.
++ *
++ * This file is part of messaging-app.
++ *
++ * messaging-app is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * messaging-app is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++import QtQuick 2.2
++import Ubuntu.Components 1.1
++
++import "dateUtils.js" as DateUtils
++
++MessageDelegate {
++    id: root
++
++    function deleteMessage()
++    {
++        eventModel.removeEvent(accountId, threadId, eventId, type)
++    }
++
++    function resendMessage()
++    {
++        eventModel.removeEvent(accountId, threadId, eventId, type)
++        chatManager.sendMessage(messages.participants, textMessage, messages.accountId)
++    }
++
++    function copyMessage()
++    {
++        Clipboard.push(bubble.messageText)
++    }
++
++    height: bubble.height
++    _lastItem: bubble
++
++    MessageBubble {
++        id: bubble
++
++        states: [
++            State {
++                name: "incoming"
++                when: incoming
++                AnchorChanges {
++                    target: bubble
++                    anchors.left: parent.left
++                }
++            },
++            State {
++                name: "outgoing"
++                when: !incoming
++                AnchorChanges {
++                    target: bubble
++                    anchors.right: parent.right
++                }
++            }
++
++        ]
++        visible: (root.text !== "")
++        messageIncoming: root.incoming
++        messageText: root.text
++        messageTimeStamp: root.timestamp
++        accountName: root.accountLabel
++        messageStatus: textMessageStatus
++    }
++}
 === modified file 'src/qml/StandardAnimation.qml'
 --- src/qml/StandardAnimation.qml	2013-07-17 21:47:45 +0000
 +++ src/qml/StandardAnimation.qml	2014-08-12 15:31:06 +0000
@@ -16,7 +16,7 @@
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
--import QtQuick 2.0
++import QtQuick 2.2
  NumberAnimation {
      duration: 300
 === modified file 'src/qml/ThreadDelegate.qml'
 --- src/qml/ThreadDelegate.qml	2014-07-31 19:01:08 +0000
 +++ src/qml/ThreadDelegate.qml	2014-08-12 15:31:06 +0000
@@ -16,7 +16,7 @@
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
--import QtQuick 2.0
++import QtQuick 2.2
  import Ubuntu.Components 1.1
  import Ubuntu.Components.Popups 0.1
  import Ubuntu.Telephony 0.1
@@ -44,7 +44,6 @@
          return firstRecipient
+     }
--    property bool selectionMode: false
      property string textMessage: {
          // check if this is an mms, if so, search for the actual text
          var imageCount = 0
@@ -111,9 +110,17 @@
      ContactAvatar {
          id: avatar
--        fallbackAvatarUrl: delegateHelper.avatar !== "" ? delegateHelper.avatar : "image://theme/contact"
++        fallbackAvatarUrl: {
++            if (groupChat) {
++                return "image://theme/contact-group"
++            } else if (delegateHelper.avatar !== "") {
++                return delegateHelper.avatar
++            } else {
++                return "image://theme/contact"
++            }
++        }
          fallbackDisplayName: delegateHelper.alias
--        showAvatarPicture: (delegateHelper.avatar !== "") || (initials.length === 0)
++        showAvatarPicture: groupChat || (delegateHelper.avatar !== "") || (initials.length === 0)
          anchors {
              left: parent.left
              top: parent.top
@@ -127,24 +134,35 @@
          id: contactName
          anchors {
              top: avatar.top
++            topMargin: units.gu(0.5)
              left: avatar.right
              leftMargin: units.gu(1)
+         }
--        fontSize: "medium"
          color: UbuntuColors.lightAubergine
          text: groupChat ? groupChatLabel : unknownContact ? delegateHelper.phoneNumber : delegateHelper.alias
+     }
--    Label {
++    Row {
          id: time
++
          anchors {
              verticalCenter: contactName.verticalCenter
              right: parent.right
+         }
--        fontSize: "x-small"
--        text: Qt.formatDateTime(eventTimestamp,"h:mm ap")
++        Label {
++            fontSize: "x-small"
++            font.weight: Font.DemiBold
++            opacity: 0.70
++            text: Qt.formatDateTime(eventTimestamp,"h:mm")
++        }
++        Label {
++            fontSize: "x-small"
++            opacity: 0.70
++            text: Qt.formatDateTime(eventTimestamp," ap")
++        }
+     }
--
++
++
      UbuntuShape {
          id: unreadCountIndicator
          height: units.gu(2)
@@ -181,20 +199,18 @@
      Label {
          id: latestMessage
--        height: units.gu(3)
++
          anchors {
              top: contactName.bottom
              topMargin: units.gu(0.5)
              left: contactName.left
              right: time.left
              rightMargin: units.gu(3)
++            bottom: avatar.bottom
+         }
          elide: Text.ElideRight
--        maximumLineCount: 2
          fontSize: "x-small"
--        wrapMode: Text.WordWrap
          text: textMessage
--        font.weight: Font.Light
+     }
      Item {
 === modified file 'src/qml/assets/conversation_incoming@27.png'
 Binary files src/qml/assets/conversation_incoming@27.png	2014-07-07 13:09:42 +0000 and src/qml/assets/conversation_incoming@27.png	2014-08-12 15:31:06 +0000 differ
 === modified file 'src/qml/messaging-app.qml'
 --- src/qml/messaging-app.qml	2014-07-31 19:16:57 +0000
 +++ src/qml/messaging-app.qml	2014-08-12 15:31:06 +0000
@@ -16,7 +16,8 @@
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
--import QtQuick 2.0
++import QtQuick 2.2
++import Qt.labs.settings 1.0
  import Ubuntu.Components 1.1
  import Ubuntu.Components.ListItems 0.1 as ListItem
  import Ubuntu.Components.Popups 0.1
@@ -27,6 +28,16 @@
      id: mainView
      property string newPhoneNumber
++    property bool multipleAccounts: telepathyHelper.accounts.length > 1
++    property QtObject defaultAccount: {
++        // we only use the default account property if we have more
++        // than one account, otherwise we use always the first one
++        if (multipleAccounts) {
++            return telepathyHelper.defaultMessagingAccount
++        } else {
++            return telepathyHelper.accounts[0]
++        }
++    }
      automaticOrientation: true
      width: units.gu(40)
@@ -40,6 +51,23 @@
          mainStack.push(Qt.resolvedUrl("MainPage.qml"))
+     }
++    Connections {
++        target: telepathyHelper
++        onSetupReady: {
++            if (multipleAccounts && !telepathyHelper.defaultMessagingAccount &&
++                settings.mainViewDontAskCount < 3 && mainStack.depth === 1) {
++                PopupUtils.open(Qt.createComponent("Dialogs/NoDefaultSIMCardDialog.qml").createObject(mainView))
++            }
++        }
++    }
++
++    Settings {
++        id: settings
++        category: "DualSim"
++        property bool messagesDontAsk: false
++        property int mainViewDontAskCount: 0
++    }
++
      Component {
          id: resultComponent
          ContentItem {}
 === modified file 'tests/autopilot/messaging_app/emulators.py'
 --- tests/autopilot/messaging_app/emulators.py	2014-08-05 19:37:08 +0000
 +++ tests/autopilot/messaging_app/emulators.py	2014-08-12 15:31:06 +0000
@@ -57,8 +57,8 @@
          """
          time.sleep(2)  # message is not always found on slow emulator
--        for message in self.select_many(MessageDelegate):
--            for item in self.select_many('Label'):
++        for message in self.select_many(MessageDelegateFactory):
++            for item in message.select_many('Label'):
                  if "text" in item.get_properties():
                      if item.get_properties()['text'] == text:
                          return message
@@ -280,7 +280,7 @@
      def enable_messages_selection_mode(self):
          """Enable the selection mode on the messages page by pressing and
          holding the first item"""
--        message = self.wait_select_single("MessageDelegate",
++        message = self.wait_select_single("MessageDelegateFactory",
                                            objectName="message0")
          self.long_press(message)
@@ -375,6 +375,8 @@
          """
          thread = self.get_thread_from_number(phone_number)
          thread.swipe_to_delete()
++        # wait for the animation to end
++        time.sleep(1)
          thread.confirm_removal()
      def delete_message(self, text):
@@ -473,8 +475,7 @@
      def _get_message_delegate(self, index):
          return self.wait_select_single(
--            'MessageDelegate', objectName='message{}'.format(index),
--            unread=False)
++            'MessageDelegateFactory', objectName='message{}'.format(index))
      def _long_press_to_select_message(self, message):
          # XXX We used to leave the pointing device pressed for three seconds,
@@ -537,5 +538,5 @@
      """Autopilot helper for ThreadDelegate."""
--class MessageDelegate(ListItemWithActions):
--    """Autopilot helper for the MessageDelegate."""
++class MessageDelegateFactory(ListItemWithActions):
++    """Autopilot helper for the MessageDelegateFactory."""
 === modified file 'tests/qml/tst_MessageBubble.qml'
 --- tests/qml/tst_MessageBubble.qml	2014-07-31 17:24:57 +0000
 +++ tests/qml/tst_MessageBubble.qml	2014-08-12 15:31:06 +0000
@@ -34,7 +34,7 @@
          height: parent.height / 3
--        incoming: true
++        messageIncoming: true
+     }
      MessageBubble {
@@ -44,7 +44,7 @@
          anchors.top: incomingMessageBubble.bottom
          height: parent.height / 3
--        incoming: false
++        messageIncoming: false
+     }
      MessageBubble {
@@ -54,7 +54,7 @@
          anchors.top: outgoingMessageBubble.bottom
          height: parent.height / 3
--        incoming: true
++        messageIncoming: true
+     }
      UbuntuTestCase {
@@ -67,7 +67,7 @@
+         }
          function cleanup() {
--            changeIncomingMessageBubble.incoming = true;
++            changeIncomingMessageBubble.messageIncoming = true;
+         }
          function getFileName(filePath) {
@@ -93,7 +93,7 @@
          function test_changeIncomingMustUpdateSource() {
              var changeIncomingMessageBubble = findChild(
                  root, 'changeIncomingMessageBubble');
--            changeIncomingMessageBubble.incoming = false;
++            changeIncomingMessageBubble.messageIncoming = false;
              compare(
                  getFileName(changeIncomingMessageBubble.source),
                  'conversation_outgoing.sci');