Merge lp:~phablet-team/messaging-app/side_panel into lp:messaging-app

[Gustavo Pichorim Boiko]

Implement convergent layout for messaging-app.

Implement convergent layout for messaging-app.

[lp:~phablet-team/messaging-app/side_panel]

450. By Gustavo Pichorim Boiko on 2015-11-03

Re-add code removed by accident.

451. By Gustavo Pichorim Boiko on 2015-11-03

Remove code added by mistake when resolving conflicts.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:449
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/685/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4994/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/198/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4991/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:451
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/690/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5006/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/203/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5003/console

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

review: Needs Fixing (continuous-integration)

[lp:~phablet-team/messaging-app/side_panel]

452. By Gustavo Pichorim Boiko on 2015-11-20

Merge latest changes from parent branch.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:452
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/732/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5289/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/245/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5309/console

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

review: Needs Fixing (continuous-integration)

[lp:~phablet-team/messaging-app/side_panel]

453. By Gustavo Pichorim Boiko on 2015-12-11

Merge trunk.

454. By Gustavo Pichorim Boiko on 2015-12-11

Merge changes from IM branches.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:454
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/845/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5738/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/354/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5751/console

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

review: Needs Fixing (continuous-integration)

[lp:~phablet-team/messaging-app/side_panel]

455. By Gustavo Pichorim Boiko on 2016-01-11

Merge latest IM changes.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:455
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/890/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5988/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/399/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5999/console

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

review: Needs Fixing (continuous-integration)

[lp:~phablet-team/messaging-app/side_panel]

456. By Gustavo Pichorim Boiko on 2016-01-14

Update messaging-app to use the new SDK header in preparation to migrate to the
new bottom edge.

457. By Gustavo Pichorim Boiko on 2016-01-15

Make sure we always have a view on the right side of the screen so that we can
add a bottom edge gesture there.

458. By Gustavo Pichorim Boiko on 2016-01-18

Use the bottom edge from SDK.

459. By Gustavo Pichorim Boiko on 2016-01-19

Make it possible to create the bottom edge page using different properties.

460. By Gustavo Pichorim Boiko on 2016-01-19

Add a cancel action to the new message state to be used in the bottom edge pages.

461. By Gustavo Pichorim Boiko on 2016-01-19

Fix exposing the bottom edge page with arguments.

462. By Gustavo Pichorim Boiko on 2016-01-19

Merge trunk.

463. By Gustavo Pichorim Boiko on 2016-01-19

Fix qml tests.

464. By Gustavo Pichorim Boiko on 2016-01-19

Increase the waiting

465. By Gustavo Pichorim Boiko on 2016-01-19

Increase the waiting time even more.

466. By Gustavo Pichorim Boiko on 2016-01-20

Move the bottom edge action to the header on dual panel environments

467. By Gustavo Pichorim Boiko on 2016-01-21

Skip the header height from the contacts popup.

468. By Gustavo Pichorim Boiko on 2016-01-21

Remove the dependency on unity8-private

469. By Gustavo Pichorim Boiko on 2016-01-21

Remove debug leftover.

470. By Gustavo Pichorim Boiko on 2016-01-21

Show a new item on listview when the bottom edge page is visible.

471. By Gustavo Pichorim Boiko on 2016-01-22

Another attempt at scrolling the list to the new item.

472. By Gustavo Pichorim Boiko on 2016-01-22

Make sure we get the view on the test before proceeding.

473. By Gustavo Pichorim Boiko on 2016-01-25

Fix one more page header.

474. By Gustavo Pichorim Boiko on 2016-01-25

Fix one more pagestack interaction

475. By Gustavo Pichorim Boiko on 2016-01-25

Fix sending audio files.

476. By Gustavo Pichorim Boiko on 2016-01-26

Start fixing the interaction with header actions and the bottom edge in autopilot
tests.

477. By Gustavo Pichorim Boiko on 2016-01-27

Make pep8 happy.

478. By Gustavo Pichorim Boiko on 2016-01-27

Fix loading the contact viewing page.

479. By Gustavo Pichorim Boiko on 2016-01-27

Make sure the To: field gets focus when composing a new message.

480. By Gustavo Pichorim Boiko on 2016-01-27

Pages loaded in the bottom edge are not in the layout, so we need to use the
underneath page as the parent to push new pages to the stack.

481. By Gustavo Pichorim Boiko on 2016-01-27

Keep the bottom edge down arrow (back action) visible after sending the first
message.

482. By Tiago Salem Herrmann on 2016-01-28

merge apparmor branch

483. By Tiago Salem Herrmann on 2016-01-28

Fix ListView anchors to avoid hide the content under the header

484. By Gustavo Pichorim Boiko on 2016-01-28

Set the title correctly.

485. By Gustavo Pichorim Boiko on 2016-01-28

Make it possible to unselect all too in the main view.

486. By Gustavo Pichorim Boiko on 2016-01-28

Fix the header in the messages view.

487. By Gustavo Pichorim Boiko on 2016-01-28

Clear some warnings.

488. By Gustavo Pichorim Boiko on 2016-01-28

Make sure the page has a height when loading.

489. By Tiago Salem Herrmann on 2016-01-28

Fix ListView anchors also on NewRecipientPage

490. By Gustavo Pichorim Boiko on 2016-01-28

Create pages manually before pushing to the AdaptivePageLayout as it is very
slow to create the pages by itself.

491. By Gustavo Pichorim Boiko on 2016-01-29

Make sure pages get destroyed when hitting back

492. By Tiago Salem Herrmann on 2016-01-29

Implement back button to destroy dynamically created pages

493. By Tiago Salem Herrmann on 2016-01-29

Push all views synchronously

494. By Gustavo Pichorim Boiko on 2016-01-29

Make it possible to launch the new message view from settings.

495. By Tiago Salem Herrmann on 2016-02-01

fix anchors in the settings page

496. By Tiago Salem Herrmann on 2016-02-01

Empty stack before adding SettingsPage to the stack

497. By Tiago Salem Herrmann on 2016-02-01

Only set properties once during object creation
implement removePage() that destroy instances when needed

498. By Tiago Salem Herrmann on 2016-02-01

check before destroying instance

499. By Tiago Salem Herrmann on 2016-02-01

anchor previewer to header

500. By Gustavo Pichorim Boiko on 2016-02-01

Move the custom page layout functions to a separate QML file.

501. By Gustavo Pichorim Boiko on 2016-02-05

Merge swipe to cancel fix.

502. By Gustavo Pichorim Boiko on 2016-02-05

Remove duplicated code.

503. By Gustavo Pichorim Boiko on 2016-02-05

Fix loading pages by source

504. By Gustavo Pichorim Boiko on 2016-02-10

Hide the bottom edge bar in the empty state screen.

505. By Gustavo Pichorim Boiko on 2016-02-10

Messaging-app doesn't belong to side stage anymore

506. By Gustavo Pichorim Boiko on 2016-02-10

Set a minimum window size.

507. By Gustavo Pichorim Boiko on 2016-02-10

Make it landscape by default on windowed environments

508. By Gustavo Pichorim Boiko on 2016-02-11

Hide the new message list item once the message is sent.

509. By Gustavo Pichorim Boiko on 2016-02-11

Show the group chat participants popup anchored to the right

510. By Gustavo Pichorim Boiko on 2016-02-12

Make the header fixed in two column mode

511. By Gustavo Pichorim Boiko on 2016-02-12

Add a scrollbar to the Messages view.

512. By Gustavo Pichorim Boiko on 2016-02-13

Merge trunk.

513. By Gustavo Pichorim Boiko on 2016-02-15

Make the readme more clear

514. By Gustavo Pichorim Boiko on 2016-02-17

In dual panel mode, always hide the empty state label.

Unmerged revisions

=== added file '.bzrignore'
--- .bzrignore	1970-01-01 00:00:00 +0000
+++ .bzrignore	2016-01-14 12:41:18 +0000
@@ -0,0 +1,37 @@
+*.qmlproject.user
+CMakeCache.txt
+CMakeFiles/
+CMakeLists.txt.user
+cmake_install.cmake
+cmake_uninstall.cmake
+Makefile
+install_manifest.txt
+CTestTestfile.cmake
+
+*.cbp
+*.moc
+moc_*.cpp
+*_automoc.cpp
+
+Testing
+RE:tests/qml/tst_\w+Tests$
+po/*.gmo
+po/src
+
+config.h
+src/messaging-app
+src/messaging-app.desktop*
+
+obj-*
+debian/usr.bin.webbrowser-app
+debian/files
+debian/tmp/
+debian/qtdeclarative5-ubuntu-ui-extras-browser-plugin/
+debian/qtdeclarative5-ubuntu-web-plugin/
+debian/qtdeclarative5-ubuntu-web-plugin-doc/
+debian/messaging-app/
+debian/messaging-app-autopilot/
+debian/*.debhelper
+debian/*.debhelper.log
+debian/*.substvars
+debian/stamp-*

=== modified file 'debian/control'
--- debian/control	2015-09-11 14:25:57 +0000
+++ debian/control	2016-01-14 12:41:18 +0000
@@ -21,8 +21,12 @@
                qtdeclarative5-ubuntu-telephony0.1 | qtdeclarative5-ubuntu-telephony-plugin,
                qtdeclarative5-ubuntu-content1,
                qtdeclarative5-ubuntu-addressbook0.1,
+               qtdeclarative5-ubuntu-thumbnailer0.1,
                qtdeclarative5-qtcontacts-plugin,
+               qtdeclarative5-folderlistmodel-plugin,
+               qtmultimedia5-dev,
                qml-module-qt-labs-settings,
+               qml-module-qtmultimedia,
                qtpim5-dev,
                xvfb,
 Standards-Version: 3.9.4
@@ -37,6 +41,7 @@
 Architecture: any
 Depends: ${misc:Depends},
          ${shlibs:Depends},
+         libqt5multimedia5,
          qtdeclarative5-ubuntu-addressbook0.1,
          qtdeclarative5-ubuntu-ui-toolkit-plugin | qt-components-ubuntu,
          qtdeclarative5-ubuntu-telephony-phonenumber0.1,

=== modified file 'debian/messaging-app.install'
--- debian/messaging-app.install	2014-08-11 22:22:59 +0000
+++ debian/messaging-app.install	2016-01-14 12:41:18 +0000
@@ -8,4 +8,5 @@
 usr/share/messaging-app/3rd_party
 usr/share/messaging-app/MMS/*.qml
 usr/share/messaging-app/Dialogs/*.qml
+usr/share/messaging-app/Stickers/*.qml
 usr/bin/*messaging-app*

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2015-02-24 13:33:31 +0000
+++ src/CMakeLists.txt	2016-01-14 12:41:18 +0000
@@ -1,18 +1,24 @@
 set(MESSAGING_APP messaging-app)
 
 set(messaging_app_HDRS
+    audiorecorder.h
+    fileoperations.h
     messagingapplication.h
+    stickers-history-model.h
     )
 
 set(messaging_app_SRCS
+    audiorecorder.cpp
+    fileoperations.cpp
     messagingapplication.cpp
     main.cpp
+    stickers-history-model.cpp
     )
 
 add_executable(${MESSAGING_APP}
     ${messaging_app_SRCS}
     )
-qt5_use_modules(${MESSAGING_APP} Core DBus Gui Qml Quick Versit)
+qt5_use_modules(${MESSAGING_APP} Core DBus Gui Multimedia Qml Quick Sql Versit)
 
 include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}

=== added file 'src/audiorecorder.cpp'
--- src/audiorecorder.cpp	1970-01-01 00:00:00 +0000
+++ src/audiorecorder.cpp	2016-01-14 12:41:18 +0000
@@ -0,0 +1,245 @@
+/*
+ * Copyright (C) 2015 Canonical, Ltd.
+ *
+ * Authors:
+ *  Arthur Renato Mello <[e-mail]>
+ *
+ * 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/>.
+ */
+
+#include "audiorecorder.h"
+
+#include <QDebug>
+#include <QDir>
+#include <QUrl>
+#include <QStandardPaths>
+#include <QTemporaryFile>
+
+AudioRecorder::AudioRecorder(QObject *parent)
+    : QObject(parent)
+{
+    m_audioRecorder = new QAudioRecorder();
+    connect(m_audioRecorder, SIGNAL(stateChanged(QMediaRecorder::State)),
+            SIGNAL(recorderStateChanged()));
+    connect(m_audioRecorder, SIGNAL(statusChanged(QMediaRecorder::Status)),
+            SIGNAL(recorderStatusChanged()));
+    connect(m_audioRecorder, SIGNAL(error(QMediaRecorder::Error)),
+            SLOT(updateRecorderError(QMediaRecorder::Error)));
+    connect(m_audioRecorder, SIGNAL(actualLocationChanged(QUrl)),
+            SLOT(updateActualLocation(QUrl)));
+    connect(m_audioRecorder, SIGNAL(durationChanged(qint64)), SIGNAL(durationChanged(qint64)));
+    connect(m_audioRecorder, SIGNAL(audioInputChanged(const QString&)),
+            SIGNAL(audioInputChanged(const QString&)));
+
+    m_audioSettings = m_audioRecorder->audioSettings();
+}
+
+AudioRecorder::~AudioRecorder()
+{
+    delete m_audioRecorder;
+}
+
+AudioRecorder::RecorderState AudioRecorder::recorderState() const
+{
+    return RecorderState(m_audioRecorder->state());
+}
+
+AudioRecorder::RecorderStatus AudioRecorder::recorderStatus() const
+{
+    return RecorderStatus(m_audioRecorder->status());
+}
+
+AudioRecorder::Error AudioRecorder::errorCode() const
+{
+    return Error(m_audioRecorder->error());
+}
+
+QString AudioRecorder::errorString() const
+{
+    return m_audioRecorder->errorString();
+}
+
+QString AudioRecorder::outputLocation() const
+{
+    return m_audioRecorder->outputLocation().toString();
+}
+
+QString AudioRecorder::actualLocation() const
+{
+    return m_audioRecorder->actualLocation().toString();
+}
+
+qint64 AudioRecorder::duration() const
+{
+    return m_audioRecorder->duration();
+}
+
+int AudioRecorder::bitRate() const
+{
+    return m_audioSettings.bitRate();
+}
+
+int AudioRecorder::channelCount() const
+{
+    return m_audioSettings.channelCount();
+}
+
+QString AudioRecorder::codec() const
+{
+    return m_audioSettings.codec();
+}
+
+AudioRecorder::EncodingQuality AudioRecorder::quality() const
+{
+    return EncodingQuality(m_audioSettings.quality());
+}
+
+int AudioRecorder::sampleRate() const
+{
+    return m_audioSettings.sampleRate();
+}
+
+QString AudioRecorder::audioInput() const
+{
+    return m_audioRecorder->audioInput();
+}
+
+void AudioRecorder::record()
+{
+    setRecorderState(RecordingState);
+}
+
+void AudioRecorder::stop()
+{
+    setRecorderState(StoppedState);
+}
+
+void AudioRecorder::pause()
+{
+    setRecorderState(PausedState);
+}
+
+void AudioRecorder::setRecorderState(AudioRecorder::RecorderState state)
+{
+    if (!m_audioRecorder)
+        return;
+
+    switch (state){
+        case AudioRecorder::RecordingState: {
+            // Create temporary file to store audio recorded
+            QDir dataLocation(QStandardPaths::writableLocation(QStandardPaths::AppDataLocation));
+            QTemporaryFile outputFile(dataLocation.absoluteFilePath("audioXXXXXX%1").arg(m_fileExtension));
+            outputFile.setAutoRemove(false);
+            outputFile.open();
+            outputFile.close();
+            setOutputLocation(outputFile.fileName());
+
+            m_audioRecorder->record();
+            break;
+        }
+        case AudioRecorder::StoppedState:
+            m_audioRecorder->stop();
+            break;
+        case AudioRecorder::PausedState:
+            m_audioRecorder->pause();
+            break;
+    }
+}
+
+void AudioRecorder::setOutputLocation(const QString &location)
+{
+    if (outputLocation() != location) {
+        // FIXME: implement auto-removal of previous recordings
+        m_audioRecorder->setOutputLocation(location);
+        Q_EMIT outputLocationChanged(outputLocation());
+    }
+}
+
+void AudioRecorder::setBitRate(int rate)
+{
+    if (bitRate() != rate) {
+        m_audioSettings.setBitRate(rate);
+        Q_EMIT bitRateChanged(rate);
+    }
+}
+
+void AudioRecorder::setChannelCount(int count)
+{
+    if (channelCount() != count) {
+        m_audioSettings.setChannelCount(count);
+        Q_EMIT channelCountChanged(count);
+    }
+}
+
+void AudioRecorder::setCodec(const QString &audioCodec)
+{
+    if (codec() != audioCodec) {
+        if (!m_audioRecorder->supportedAudioCodecs().contains(audioCodec)) {
+            qWarning() << "AudioRecorder error: Unsupported Audio Codec: " << audioCodec;
+            return;
+        }
+
+        if (audioCodec == "audio/vorbis" ||
+            audioCodec == "audio/speex" ||
+            audioCodec == "audio/FLAC") {
+
+            m_audioRecorder->setContainerFormat("ogg");
+            m_fileExtension = ".ogg";
+        } else if (audioCodec == "audio/PCM") {
+            m_audioRecorder->setContainerFormat("wav");
+            m_fileExtension = ".wav";
+        } else {
+            m_audioRecorder->setContainerFormat("raw");
+        }
+
+        m_audioSettings.setCodec(audioCodec);
+        Q_EMIT codecChanged(audioCodec);
+    }
+}
+
+void AudioRecorder::setQuality(AudioRecorder::EncodingQuality encodingQuality)
+{
+    if (quality() != encodingQuality) {
+        m_audioSettings.setQuality(QMultimedia::EncodingQuality(encodingQuality));
+        Q_EMIT qualityChanged(encodingQuality);
+    }
+}
+
+void AudioRecorder::setSampleRate(int rate)
+{
+    if (sampleRate() != rate) {
+        m_audioSettings.setSampleRate(rate);
+        Q_EMIT sampleRateChanged(rate);
+    }
+}
+
+void AudioRecorder::setAudioInput(const QString &input)
+{
+    if (audioInput() != input) {
+        m_audioRecorder->setAudioInput(input);
+        Q_EMIT audioInputChanged(input);
+    }
+}
+
+void AudioRecorder::updateRecorderError(QMediaRecorder::Error errorCode)
+{
+    qWarning() << "AudioRecorder error:" << errorString();
+    Q_EMIT errorChanged(Error(errorCode), errorString());
+}
+
+void AudioRecorder::updateActualLocation(const QUrl &url)
+{
+    Q_EMIT actualLocationChanged(url.toString());
+}

=== added file 'src/audiorecorder.h'
--- src/audiorecorder.h	1970-01-01 00:00:00 +0000
+++ src/audiorecorder.h	2016-01-14 12:41:18 +0000
@@ -0,0 +1,142 @@
+/*
+ * Copyright (C) 2015 Canonical, Ltd.
+ *
+ * Authors:
+ *  Arthur Renato Mello <[e-mail]>
+ *
+ * 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/>.
+ */
+
+#ifndef AUDIORECORDER_H
+#define AUDIORECORDER_H
+
+#include <QObject>
+#include <QAudioRecorder>
+
+class AudioRecorder : public QObject
+{
+    Q_OBJECT
+
+    Q_ENUMS(EncodingQuality)
+    Q_ENUMS(Error)
+    Q_ENUMS(RecorderState)
+    Q_ENUMS(RecorderStatus)
+
+    Q_PROPERTY(RecorderState recorderState READ recorderState WRITE setRecorderState NOTIFY recorderStateChanged)
+    Q_PROPERTY(RecorderStatus recorderStatus READ recorderStatus NOTIFY recorderStatusChanged)
+    Q_PROPERTY(QString errorString READ errorString NOTIFY errorChanged)
+    Q_PROPERTY(Error errorCode READ errorCode NOTIFY errorChanged)
+    Q_PROPERTY(QString outputLocation READ outputLocation NOTIFY outputLocationChanged)
+    Q_PROPERTY(QString actualLocation READ actualLocation NOTIFY actualLocationChanged)
+    Q_PROPERTY(qint64 duration READ duration NOTIFY durationChanged)
+    Q_PROPERTY(int bitRate READ bitRate WRITE setBitRate NOTIFY bitRateChanged);
+    Q_PROPERTY(int channelCount READ channelCount WRITE setChannelCount NOTIFY channelCountChanged);
+    Q_PROPERTY(QString codec READ codec WRITE setCodec NOTIFY codecChanged);
+    Q_PROPERTY(EncodingQuality quality READ quality WRITE setQuality NOTIFY qualityChanged);
+    Q_PROPERTY(int sampleRate READ sampleRate WRITE setSampleRate NOTIFY sampleRateChanged);
+    Q_PROPERTY(QString audioInput READ audioInput WRITE setAudioInput NOTIFY audioInputChanged);
+
+public:
+    enum EncodingQuality
+    {
+        VeryLowQuality = QMultimedia::VeryLowQuality,
+        LowQuality = QMultimedia::LowQuality,
+        NormalQuality = QMultimedia::NormalQuality,
+        HighQuality = QMultimedia::HighQuality,
+        VeryHighQuality = QMultimedia::VeryHighQuality
+    };
+
+    enum Error
+    {
+        NoError = QMediaRecorder::NoError,
+        ResourceError = QMediaRecorder::ResourceError,
+        FormatError = QMediaRecorder::FormatError,
+        OutOfSpaceError = QMediaRecorder::OutOfSpaceError
+    };
+ 
+    enum RecorderState
+    {
+        StoppedState = QMediaRecorder::StoppedState,
+        RecordingState = QMediaRecorder::RecordingState,
+        PausedState = QMediaRecorder::PausedState
+    };
+
+    enum RecorderStatus
+    {
+        UnavailableStatus = QMediaRecorder::UnavailableStatus,
+        UnloadedStatus = QMediaRecorder::UnloadedStatus,
+        LoadingStatus = QMediaRecorder::LoadingStatus,
+        LoadedStatus = QMediaRecorder::LoadedStatus,
+        StartingStatus = QMediaRecorder::StartingStatus,
+        RecordingStatus = QMediaRecorder::RecordingStatus,
+        PausedStatus = QMediaRecorder::PausedStatus,
+        FinalizingStatus = QMediaRecorder::FinalizingStatus
+    };
+
+    AudioRecorder(QObject *parent = 0);
+    ~AudioRecorder();
+
+    RecorderState recorderState() const;
+    RecorderStatus recorderStatus() const;
+    Error errorCode() const;
+    QString errorString() const;
+    QString outputLocation() const;
+    QString actualLocation() const;
+    qint64 duration() const;
+    int bitRate() const;
+    int channelCount() const;
+    QString codec() const;
+    EncodingQuality quality() const;
+    int sampleRate() const;
+    QString audioInput() const;
+
+public Q_SLOTS:
+    void record();
+    void stop();
+    void pause();
+    void setRecorderState(AudioRecorder::RecorderState state);
+    void setOutputLocation(const QString &location);
+    void setBitRate(int rate);
+    void setChannelCount(int count);
+    void setCodec(const QString &audioCodec);
+    void setQuality(AudioRecorder::EncodingQuality encodingQuality);
+    void setSampleRate(int rate);
+    void setAudioInput(const QString &input);
+
+Q_SIGNALS:
+    void recorderStateChanged();
+    void recorderStatusChanged();
+    void errorChanged(AudioRecorder::Error errorCode, const QString &errorString);
+    void outputLocationChanged(const QString &location);
+    void actualLocationChanged(const QString &location);
+    void durationChanged(qint64 duration);
+    void bitRateChanged(int rate);
+    void channelCountChanged(int count);
+    void codecChanged(const QString &codec);
+    void qualityChanged(AudioRecorder::EncodingQuality quality);
+    void sampleRateChanged(int rate);
+    void audioInputChanged(const QString &input);
+
+private Q_SLOTS:
+    void updateRecorderError(QMediaRecorder::Error);
+    void updateActualLocation(const QUrl&);
+
+private:
+    QAudioRecorder *m_audioRecorder;
+    QAudioEncoderSettings m_audioSettings;
+    QString m_fileExtension;
+};
+
+#endif // AUDIORECORDER_H

=== added file 'src/fileoperations.cpp'
--- src/fileoperations.cpp	1970-01-01 00:00:00 +0000
+++ src/fileoperations.cpp	2016-01-14 12:41:18 +0000
@@ -0,0 +1,58 @@
+/*
+ * Copyright (C) 2015 Canonical, Ltd.
+ *
+ * Authors:
+ *  Arthur Mello <[e-mail]>
+ *
+ * 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/>.
+ */
+
+#include "fileoperations.h"
+
+#include <QDir>
+#include <QFile>
+#include <QTemporaryFile>
+
+FileOperations::FileOperations(QObject *parent)
+    : QObject(parent)
+{
+}
+
+FileOperations::~FileOperations()
+{
+}
+
+QString FileOperations::getTemporaryFile(const QString &fileExtension) const
+{
+    //TODO remove once lp:1420728 is fixed
+    QTemporaryFile tmp(QDir::tempPath() + "/tmpXXXXXX" + fileExtension);
+    tmp.open();
+    return tmp.fileName();
+}
+
+bool FileOperations::link(const QString &from, const QString &to)
+{
+    return QFile::link(from, to);
+}
+
+bool FileOperations::remove(const QString &fileName)
+{
+    return QFile::remove(fileName);
+}
+
+qint64 FileOperations::size(const QString &filePath)
+{
+    return QFile(filePath).size();
+}

=== added file 'src/fileoperations.h'
--- src/fileoperations.h	1970-01-01 00:00:00 +0000
+++ src/fileoperations.h	2016-01-14 12:41:18 +0000
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2015 Canonical, Ltd.
+ *
+ * Authors:
+ *  Arthur Mello <[e-mail]>
+ *
+ * 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/>.
+ */
+
+#ifndef FILEOPERATIONS_H
+#define FILEOPERATIONS_H
+
+#include <QObject>
+
+class FileOperations : public QObject
+{
+    Q_OBJECT
+
+public:
+    FileOperations(QObject *parent = 0);
+    ~FileOperations();
+
+    Q_INVOKABLE QString getTemporaryFile(const QString &fileExtension) const;
+    Q_INVOKABLE bool link(const QString &from, const QString &to);
+    Q_INVOKABLE bool remove(const QString &fileName);
+    Q_INVOKABLE qint64 size(const QString &filePath);
+};
+
+#endif // FILEOPERATIONS_H

=== modified file 'src/messagingapplication.cpp'
--- src/messagingapplication.cpp	2015-11-23 19:51:16 +0000
+++ src/messagingapplication.cpp	2016-01-14 12:41:18 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Canonical, Ltd.
+ * Copyright (C) 2012-2015 Canonical, Ltd.
  *
  * This file is part of messaging-app.
  *
@@ -17,6 +17,9 @@
  */
 
 #include "messagingapplication.h"
+#include "audiorecorder.h"
+#include "fileoperations.h"
+#include "stickers-history-model.h"
 
 #include <libnotify/notify.h>
 
@@ -24,6 +27,7 @@
 #include <QUrl>
 #include <QUrlQuery>
 #include <QDebug>
+#include <QDir>
 #include <QStringList>
 #include <QQuickItem>
 #include <QQmlComponent>
@@ -36,6 +40,7 @@
 #include "config.h"
 #include <QQmlEngine>
 #include <QMimeDatabase>
+#include <QStandardPaths>
 #include <QVersitReader>
 
 using namespace QtVersit;
@@ -65,12 +70,31 @@
     }
 }
 
+static QObject* FileOperations_singleton_factory(QQmlEngine* engine, QJSEngine* scriptEngine)
+{
+    Q_UNUSED(engine);
+    Q_UNUSED(scriptEngine);
+    return new FileOperations();
+}
+
+static QObject* StickersHistoryModel_singleton_factory(QQmlEngine* engine, QJSEngine* scriptEngine)
+{
+    Q_UNUSED(engine);
+    Q_UNUSED(scriptEngine);
+    return new StickersHistoryModel();
+}
+
 MessagingApplication::MessagingApplication(int &argc, char **argv)
     : QGuiApplication(argc, argv), m_view(0), m_applicationIsReady(false)
 {
     setApplicationName("MessagingApp");
 }
 
+bool MessagingApplication::fullscreen() const
+{
+    return m_view->windowState() == Qt::WindowFullScreen;
+}
+
 bool MessagingApplication::setup()
 {
     installIconPath();
@@ -149,6 +173,14 @@
         m_view->rootContext()->setContextProperty("QTCONTACTS_MANAGER_OVERRIDE", contactsBackend);
     }
 
+    QDir dataLocation(QStandardPaths::writableLocation(QStandardPaths::AppDataLocation));
+    m_view->rootContext()->setContextProperty("dataLocation", dataLocation.absolutePath());
+    dataLocation.mkpath("stickers");
+    const char* uri = "messagingapp.private";
+    qmlRegisterType<AudioRecorder>(uri, 0, 1, "AudioRecorder");
+    qmlRegisterSingletonType<FileOperations>(uri, 0, 1, "FileOperations", FileOperations_singleton_factory);
+    qmlRegisterSingletonType<StickersHistoryModel>(uri, 0, 1, "StickersHistoryModel", StickersHistoryModel_singleton_factory);
+
     // used by autopilot tests to load vcards during tests
     QByteArray testData = qgetenv("QTCONTACTS_PRELOAD_VCARD");
     m_view->rootContext()->setContextProperty("QTCONTACTS_PRELOAD_VCARD", testData);
@@ -176,6 +208,17 @@
     }
 }
 
+void MessagingApplication::setFullscreen(bool fullscreen)
+{
+    if (fullscreen) {
+        m_view->setWindowState(Qt::WindowFullScreen);
+    } else {
+        m_view->setWindowState(Qt::WindowNoState);
+    }
+
+    Q_EMIT fullscreenChanged();
+}
+
 void MessagingApplication::onViewStatusChanged(QQuickView::Status status)
 {
     if (status != QQuickView::Ready) {

=== modified file 'src/messagingapplication.h'
--- src/messagingapplication.h	2015-11-18 16:36:51 +0000
+++ src/messagingapplication.h	2016-01-14 12:41:18 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2013 Canonical, Ltd.
+ * Copyright (C) 2012-2015 Canonical, Ltd.
  *
  * This file is part of messaging-app.
  *
@@ -26,13 +26,18 @@
 class MessagingApplication : public QGuiApplication
 {
     Q_OBJECT
+    Q_PROPERTY(bool fullscreen READ fullscreen WRITE setFullscreen NOTIFY fullscreenChanged)
 
 public:
     MessagingApplication(int &argc, char **argv);
     virtual ~MessagingApplication();
 
+    bool fullscreen() const;
     bool setup();
 
+Q_SIGNALS:
+    void fullscreenChanged();
+
 public Q_SLOTS:
     void activateWindow();
     void parseArgument(const QString &arg);
@@ -41,6 +46,7 @@
     void showNotificationMessage(const QString &message, const QString &icon = QString());
 
 private Q_SLOTS:
+    void setFullscreen(bool fullscreen);
     void onViewStatusChanged(QQuickView::Status status);
     void onApplicationReady();
 

=== added file 'src/qml/AttachmentPanel.qml'
--- src/qml/AttachmentPanel.qml	1970-01-01 00:00:00 +0000
+++ src/qml/AttachmentPanel.qml	2016-01-14 12:41:18 +0000
@@ -0,0 +1,174 @@
+/*
+ * Copyright 2015 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.3
+import Ubuntu.Components.ListItems 1.3 as ListItem
+import QtQuick.Layouts 1.0
+
+Item {
+    id: panel
+    signal attachmentAvailable(var attachment)
+
+    property bool expanded: false
+
+    function show() {
+        expanded = true
+    }
+
+    function hide() {
+        expanded = false
+    }
+
+    height: expanded ? childrenRect.height + units.gu(3): 0
+    opacity: expanded ? 1 : 0
+    visible: opacity > 0
+    Behavior on height {
+        UbuntuNumberAnimation {}
+    }
+    Behavior on opacity {
+        UbuntuNumberAnimation { }
+    }
+
+    enabled: expanded
+
+    Connections {
+        target: Qt.inputMethod
+        onVisibleChanged: {
+            if (Qt.inputMethod.visible) {
+                panel.expanded = false
+            }
+        }
+    }
+
+    ContentImport {
+        id: contentImporter
+
+        onContentReceived: {
+            var attachment = {}
+            var filePath = String(contentUrl).replace('file://', '')
+            attachment["contentType"] = application.fileMimeType(filePath)
+            attachment["name"] = filePath.split('/').reverse()[0]
+            attachment["filePath"] = filePath
+            panel.attachmentAvailable(attachment)
+            hide()
+        }
+    }
+
+    ListItem.ThinDivider {
+        id: divider
+        anchors {
+            top: parent.top
+            left: parent.left
+            right: parent.right
+        }
+    }
+
+    GridLayout {
+        id: grid
+
+        property int iconSize: units.gu(3)
+        property int buttonSpacing: units.gu(2)
+        anchors {
+            top: parent.top
+            topMargin: units.gu(3)
+            left: parent.left
+            right: parent.right
+        }
+
+        height: childrenRect.height
+        columns: 4
+        rowSpacing: units.gu(3)
+
+        TransparentButton {
+            id: pictureButton
+            objectName: "pictureButton"
+            iconName: "stock_image"
+            iconSize: grid.iconSize
+            spacing: grid.buttonSpacing
+            text: i18n.tr("Image")
+            Layout.alignment: Qt.AlignHCenter
+            onClicked: {
+                contentImporter.requestPicture()
+            }
+        }
+
+        TransparentButton {
+            id: videoButton
+            objectName: "videoButton"
+            iconName: "stock_video"
+            iconSize: grid.iconSize
+            spacing: grid.buttonSpacing
+            text: i18n.tr("Video")
+            Layout.alignment: Qt.AlignHCenter
+            onClicked: {
+                contentImporter.requestVideo()
+            }
+        }
+
+        // FIXME: enable generic file sharing if we ever support it
+        /*TransparentButton {
+            id: fileButton
+            objectName: "fileButton"
+            iconSource: Qt.resolvedUrl("assets/stock_document.svg")
+            iconSize: grid.iconSize
+            spacing: grid.buttonSpacing
+            text: i18n.tr("File")
+            Layout.alignment: Qt.AlignHCenter
+            onClicked: {
+                contentImporter.requestDocument()
+            }
+        }*/
+
+        // FIXME: enable location sharing if we ever support it
+        /*TransparentButton {
+            id: locationButton
+            objectName: "locationButton"
+            iconName: "location"
+            iconSize: grid.iconSize
+            spacing: grid.buttonSpacing
+            text: i18n.tr("Location")
+            Layout.alignment: Qt.AlignHCenter
+        }*/
+
+        TransparentButton {
+            id: contactButton
+            objectName: "contactButton"
+            iconName: "stock_contact"
+            iconSize: grid.iconSize
+            spacing: grid.buttonSpacing
+            text: i18n.tr("Contact")
+            Layout.alignment: Qt.AlignHCenter
+            onClicked: {
+                contentImporter.requestContact()
+            }
+        }
+
+        // FIXME: enable that once we add support for burn-after-read
+        /*TransparentButton {
+            id: burnAfterReadButton
+            objectName: "burnAfterReadButton"
+            iconSource: Qt.resolvedUrl("assets/burn-after-read.svg")
+            iconSize: grid.iconSize
+            spacing: grid.buttonSpacing
+            text: i18n.tr("Burn after read")
+            Layout.alignment: Qt.AlignHCenter
+        }*/
+    }
+}
+

=== added file 'src/qml/AudioPlaybackBar.qml'
--- src/qml/AudioPlaybackBar.qml	1970-01-01 00:00:00 +0000
+++ src/qml/AudioPlaybackBar.qml	2016-01-14 12:41:18 +0000
@@ -0,0 +1,187 @@
+/*
+ * Copyright 2015 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 QtMultimedia 5.0
+import Ubuntu.Components 1.3
+import Ubuntu.Components.Themes.Ambiance 1.3
+import "dateUtils.js" as DateUtils
+
+Item {
+    id: playbackBar
+
+    signal resetRequested()
+    property string source: ""
+    property int duration: audioPlayer.duration
+    readonly property bool playing: audioPlayer.playing
+
+    Loader {
+        id: audioPlayer
+        readonly property bool playing: ready ? item.playing : false
+        readonly property bool paused: ready ? item.paused : false
+        readonly property bool stopped: ready ? item.stopped : false
+        readonly property int position: ready ? item.position : 0
+        readonly property int duration: ready ? item.duration : 0
+        readonly property bool ready: status == Loader.Ready
+        readonly property int playbackState: ready ? item.playbackState : Audio.StoppedState
+        function play() { 
+            audioPlayer.active = true
+            item.play() 
+        }
+        function stop() {
+            item.stop()
+            audioPlayer.active = false
+        }
+        function pause() { item.pause() }
+        function seek(pos) { item.seek(pos) }
+        active: false
+        sourceComponent: audioPlayerComponent
+    }
+
+    Component {
+        id: audioPlayerComponent
+        Audio {
+            id: audioPlayer1
+            readonly property bool playing: audioPlayer1.playbackState == Audio.PlayingState
+            readonly property bool paused: audioPlayer1.playbackState == Audio.PausedState
+            readonly property bool stopped: audioPlayer1.playbackState == Audio.StoppedState
+            source: playbackBar.source
+        }
+    }
+
+    TransparentButton {
+        id: closeButton
+        objectName: "closeButton"
+
+        anchors {
+            left: parent.left
+            leftMargin: units.gu(2)
+            verticalCenter: parent.verticalCenter
+        }
+
+        iconName: "close"
+
+        onClicked: {
+            playbackBar.resetRequested()
+        }
+    }
+
+    Item {
+        id: audioPreview
+        anchors {
+            top: parent.top
+            bottom: parent.bottom
+            left: closeButton.right
+            right: parent.right
+            topMargin: units.gu(1)
+            bottomMargin: units.gu(1)
+            leftMargin: units.gu(3)
+            rightMargin: units.gu(1)
+        }
+
+        TransparentButton {
+            id: playButton
+
+            anchors {
+                top: parent.top
+                left: parent.left
+                topMargin: units.gu(0.5)
+            }
+
+            iconColor: "grey"
+            iconName: audioPlayer.playing ? "media-playback-pause" : "media-playback-start"
+
+            textSize: FontUtils.sizeToPixels("x-small")
+            text: {
+                if (audioPlayer.playing) {
+                    return DateUtils.formattedTime(audioPlayer.position/ 1000)
+                }
+                return DateUtils.formattedTime(playbackBar.duration / 1000)
+            }
+
+            onClicked: {
+                if (audioPlayer.playing) {
+                    audioPlayer.pause()
+                } else {
+                    audioPlayer.play()
+                }
+            }
+        }
+
+        Slider {
+            id: slider
+            Connections {
+                target: audioPlayer
+                onDurationChanged: {
+                    if (slider.maximumValue == 100) {
+                        slider.maximumValue = audioPlayer.duration
+                    }
+                }
+            }
+            style: SliderStyle {
+                Component.onCompleted: thumb.visible = false
+                Connections {
+                    target: audioPlayer
+                    onPlaybackStateChanged: {
+                        thumb.visible = !audioPlayer.stopped
+                        if (!thumb.visible) {
+                            audioPlayer.seek(0)
+                        }
+                    }
+                }
+            }
+            enabled: !audioPlayer.stopped
+            function formatValue(v) { return DateUtils.formattedTime(v/1000) }
+            anchors {
+                top: parent.top
+                bottom: parent.bottom
+                left: playButton.right
+                right: parent.right
+                leftMargin: units.gu(1)
+            }
+            height: units.gu(3)
+            minimumValue: 0.0
+            maximumValue: 100
+            value: audioPlayer.position
+            activeFocusOnPress: false
+            onPressedChanged: {
+                if (!pressed) {
+                    if (audioPlayer.playing || audioPlayer.paused) {
+                        audioPlayer.seek(value)
+                    } else {
+                        audioPlayer.muted = true
+                        // we only get the duration while playing
+                        audioPlayer.play()
+                        audioPlayer.pause()
+                        if (audioPlayer.duration == 100) {
+                            audioPlayer.seek((audioPlayer.duration*value)/100)
+                        } else {
+                            audioPlayer.seek(value)
+                        }
+                        audioPlayer.muted = false
+
+                    }
+                    value = Qt.binding(function(){ return audioPlayer.position})
+                }
+            }
+        }
+    }
+
+
+}
+

=== added file 'src/qml/AudioRecordingBar.qml'
--- src/qml/AudioRecordingBar.qml	1970-01-01 00:00:00 +0000
+++ src/qml/AudioRecordingBar.qml	2016-01-14 12:41:18 +0000
@@ -0,0 +1,137 @@
+/*
+ * Copyright 2015 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.3
+import messagingapp.private 0.1
+import "dateUtils.js" as DateUtils
+
+Item {
+    id: recordingBar
+    opacity: audioRecorder.recording ? 1.0 : 0.0
+    Behavior on opacity { UbuntuNumberAnimation {} }
+    visible: opacity > 0
+
+    property int duration: 0
+    readonly property bool recording: audioRecorder.recording
+    property real buttonOpacity: 1
+
+    signal audioRecorded(var audio)
+
+    function startRecording() {
+        audioRecorder.record()
+    }
+
+    function stopRecording() {
+        audioRecorder.stop()
+    }
+
+    Loader {
+        id: audioRecorder
+        readonly property bool ready: status == Loader.Ready
+        readonly property bool recording: ready ? item.recorderState == AudioRecorder.RecordingState : false
+        readonly property int duration: ready ? item.duration : 0
+        function record() {
+            audioRecorder.active = true
+            item.record()
+        }
+        function stop() {
+            item.stop()
+            audioRecorder.active = false
+        }
+ 
+        active: false
+        sourceComponent: audioRecorderComponent
+    }
+
+    Component {
+        id: audioRecorderComponent
+        AudioRecorder {
+            readonly property bool recording: recorderState == AudioRecorder.RecordingState
+
+            onRecorderStateChanged: {
+                if (recorderState == AudioRecorder.StoppedState && actualLocation != "") {
+                    var filePath = actualLocation
+
+                    if (application.fileMimeType(filePath).toLowerCase().indexOf("audio/") <= -1) {
+                        //If the recording process is too quick the generated file is not an audio one and should be ignored
+                        return;
+                    }
+
+                    var attachment = {}
+                    attachment["contentType"] = application.fileMimeType(filePath)
+                    attachment["name"] = filePath.split('/').reverse()[0]
+                    attachment["filePath"] = filePath
+                    recordingBar.audioRecorded(attachment)
+
+                    recordingBar.duration = duration
+                }
+            }
+
+            codec: "audio/vorbis"
+            quality: AudioRecorder.VeryHighQuality
+        }
+    }
+
+    TransparentButton {
+        id: recordingIcon
+        objectName: "recordingIcon"
+        iconPulsate: true
+        sideBySide: true
+        spacing: units.gu(1)
+        opacity: buttonOpacity
+
+        anchors {
+            left: parent.left
+            leftMargin: units.gu(2)
+            verticalCenter: parent.verticalCenter
+        }
+
+        focus: false
+
+        iconColor: "red"
+        iconName: "audio-input-microphone-symbolic"
+
+        textSize: FontUtils.sizeToPixels("x-small")
+        text: {
+            if (audioRecorder.recording) {
+                return DateUtils.formattedTime(audioRecorder.duration / 1000)
+            }
+            return DateUtils.formattedTime(0)
+        }
+    }
+
+    Label {
+        anchors {
+            top: parent.top
+            bottom: parent.bottom
+            left: recordingIcon.right
+            right: parent.right
+            topMargin: units.gu(1)
+            bottomMargin: units.gu(1)
+            leftMargin: units.gu(1)
+            rightMargin: units.gu(1)
+        }
+        opacity: buttonOpacity
+
+        text: i18n.tr("<<< Swipe to cancel")
+        verticalAlignment: Text.AlignVCenter
+        horizontalAlignment: Text.AlignHCenter
+    }
+}
+

=== modified file 'src/qml/CMakeLists.txt'
--- src/qml/CMakeLists.txt	2014-08-11 22:22:59 +0000
+++ src/qml/CMakeLists.txt	2016-01-14 12:41:18 +0000
@@ -17,3 +17,4 @@
 
 add_subdirectory(MMS)
 add_subdirectory(Dialogs)
+add_subdirectory(Stickers)

=== added file 'src/qml/ComposeBar.qml'
--- src/qml/ComposeBar.qml	1970-01-01 00:00:00 +0000
+++ src/qml/ComposeBar.qml	2016-01-14 12:41:18 +0000
@@ -0,0 +1,534 @@
+/*
+ * Copyright 2012-2015 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 QtMultimedia 5.0
+import Ubuntu.Components 1.3
+import Ubuntu.Components.ListItems 1.3 as ListItem
+import Ubuntu.Components.Popups 1.3
+import Ubuntu.Content 0.1
+import Ubuntu.Telephony 0.1
+import "Stickers"
+
+Item {
+    id: composeBar
+
+    property bool showContents: true
+    property int maxHeight: textEntry.height + units.gu(2)
+    property variant attachments: []
+    property bool canSend: true
+    property alias text: messageTextArea.text
+    property bool audioAttached: attachments.count == 1 && attachments.get(0).contentType.toLowerCase().indexOf("audio/") > -1
+    // Audio QML component needs to process the recorded audio to find duration and AudioRecorder seems to erase duration after some events
+    property alias audioRecordedDuration: audioRecordingBar.duration
+    property alias recording: audioRecordingBar.recording
+    property bool oskEnabled: true
+
+    signal sendRequested(string text, var attachments)
+
+    // internal properties
+    property int _activeAttachmentIndex: -1
+    property int _defaultHeight: textEntry.height + attachmentPanel.height + stickersPicker.height + units.gu(2)
+
+    Component.onDestruction: {
+        composeBar.reset()
+    }
+
+    function forceFocus() {
+        messageTextArea.forceActiveFocus()
+    }
+
+    function reset() {
+        if (composeBar.audioAttached) {
+            FileOperations.remove(attachments.get(0).filePath)
+        }
+
+        textEntry.text = ""
+        attachments.clear()
+    }
+
+    function addAttachments(transfer) {
+        for (var i = 0; i < transfer.items.length; i++) {
+            if (String(transfer.items[i].text).length > 0) {
+                composeBar.text = String(transfer.items[i].text)
+                continue
+            }
+            var attachment = {}
+            if (!startsWith(String(transfer.items[i].url),"file://")) {
+                composeBar.text = String(transfer.items[i].url)
+                continue
+            }
+            var filePath = String(transfer.items[i].url).replace('file://', '')
+            // get only the basename
+            attachment["contentType"] = application.fileMimeType(filePath)
+            if (startsWith(attachment["contentType"], "text/vcard") ||
+                startsWith(attachment["contentType"], "text/x-vcard")) {
+                attachment["name"] = "contact.vcf"
+            } else {
+                attachment["name"] = filePath.split('/').reverse()[0]
+            }
+            attachment["filePath"] = filePath
+            attachments.append(attachment)
+        }
+    }
+
+    anchors.bottom: isSearching ? parent.bottom : keyboard.top
+    anchors.left: parent.left
+    anchors.right: parent.right
+    height: showContents ? Math.min(_defaultHeight, maxHeight) : 0
+    visible: showContents
+    clip: true
+
+    Behavior on height {
+        UbuntuNumberAnimation { }
+    }
+
+    MouseArea {
+        enabled: !composeBar.audioAttached
+        anchors.fill: parent
+        onClicked: {
+            forceFocus()
+        }
+    }
+
+    ListModel {
+        id: attachments
+    }
+
+    Component {
+        id: attachmentPopover
+
+        Popover {
+            id: popover
+            Column {
+                id: containerLayout
+                anchors {
+                    left: parent.left
+                    top: parent.top
+                    right: parent.right
+                }
+                ListItem.Standard {
+                    text: i18n.tr("Remove")
+                    onClicked: {
+                        attachments.remove(_activeAttachmentIndex)
+                        PopupUtils.close(popover)
+                    }
+                }
+            }
+            Component.onDestruction: _activeAttachmentIndex = -1
+        }
+    }
+
+    ListItem.ThinDivider {
+        anchors.top: parent.top
+    }
+
+    Row {
+        id: leftSideActions
+        opacity: {
+            if (composeBar.recording) {
+                // we need to fade the buttons in when dragging
+                return dragTarget.dragAmount
+            } else if (composeBar.audioAttached) {
+                return 0;
+            } else {
+                return 1
+            }
+        }
+
+        Behavior on opacity { UbuntuNumberAnimation {} }
+        visible: opacity > 0
+
+        width: childrenRect.width
+        height: childrenRect.height
+
+        anchors {
+            left: parent.left
+            leftMargin: units.gu(2)
+            verticalCenter: sendButton.verticalCenter
+        }
+        spacing: units.gu(2)
+
+        TransparentButton {
+            id: attachButton
+            objectName: "attachButton"
+            iconName: "add"
+            iconRotation: attachmentPanel.expanded ? 45 : 0
+            onClicked: {
+                attachmentPanel.expanded = !attachmentPanel.expanded
+                if (attachmentPanel.expanded) {
+                    stickersPicker.expanded = false
+                }
+            }
+        }
+
+        TransparentButton {
+            id: stickersButton
+            objectName: "stickersButton"
+            iconSource: (stickersPicker.expanded && oskEnabled) ? Qt.resolvedUrl("./assets/input-keyboard-symbolic.svg") :
+                                                                  Qt.resolvedUrl("./assets/face-smile-big-symbolic-2.svg")
+            visible: stickerPacksModel.count > 0
+            onClicked: {
+                if (!stickersPicker.expanded) {
+                    messageTextArea.focus = false
+                    stickersPicker.expanded = true
+                    attachmentPanel.expanded = false
+                } else {
+                    stickersPicker.expanded = false
+                    messageTextArea.forceActiveFocus()
+                }
+            }
+        }
+    }
+
+    AudioPlaybackBar {
+        id: audioPlaybackBar
+
+        anchors {
+            left: parent.left
+            right: audioRecordingBar.right
+            top: parent.top
+            bottom: attachmentPanel.top
+        }
+
+        source: composeBar.audioAttached ? attachments.get(0).filePath : ""
+        duration: audioRecordedDuration
+
+        opacity: composeBar.audioAttached ? 1.0 : 0.0
+        Behavior on opacity { UbuntuNumberAnimation {} }
+        visible: opacity > 0
+
+        onResetRequested: {
+            composeBar.reset()
+        }
+    }
+
+    AudioRecordingBar {
+        id: audioRecordingBar
+
+        anchors {
+            left: parent.left
+            right: dragTarget.left
+            top: parent.top
+            bottom: attachmentPanel.top
+        }
+
+        buttonOpacity: 1 - dragTarget.dragAmount
+
+        onAudioRecorded:  {
+            attachments.append(audio)
+        }
+    }
+
+    Item {
+        id: dragTarget
+
+        property real recordingX: recordButton.x
+        property real normalX: leftSideActions.x + leftSideActions.width
+        property real delta: recordingX - normalX
+        property real dragAmount: 1 - (x - normalX) / (delta > 0 ? delta : 0.0001)
+        x: (composeBar.recording || composeBar.audioAttached) ? recordingX : normalX
+        Behavior on x { UbuntuNumberAnimation { } }
+        width: 0
+    }
+
+    StyledItem {
+        id: textEntry
+        property alias text: messageTextArea.text
+        property alias inputMethodComposing: messageTextArea.inputMethodComposing
+        property int fullSize: composeBar.audioAttached ? messageTextArea.height : attachmentThumbnails.height + messageTextArea.height
+        style: Theme.createStyleComponent("TextAreaStyle.qml", textEntry)
+        anchors {
+            topMargin: units.gu(1)
+            top: parent.top
+            left: dragTarget.right
+            leftMargin: units.gu(2)
+            right: sendButton.left
+            rightMargin: units.gu(2)
+        }
+        height: attachments.count !== 0 && !composeBar.audioAttached ? fullSize + units.gu(1.5) : fullSize
+        onActiveFocusChanged: {
+            if(activeFocus) {
+                stickersPicker.expanded = false
+                messageTextArea.forceActiveFocus()
+            } else {
+                focus = false
+            }
+        }
+
+        onTextChanged: {
+            // in case there is audio attached and the user starts typing, we remove the attachment
+            // and continue the text message
+            if (text !== "" && composeBar.audioAttached) {
+                attachments.clear()
+            }
+        }
+
+        focus: false
+        opacity: composeBar.audioAttached ? 0.0 : 1.0
+        Behavior on opacity { UbuntuNumberAnimation {} }
+        MouseArea {
+            anchors.fill: parent
+            onClicked: forceFocus()
+        }
+        Flow {
+            id: attachmentThumbnails
+            spacing: units.gu(1)
+            anchors{
+                left: parent.left
+                right: parent.right
+                top: parent.top
+                topMargin: units.gu(1)
+                leftMargin: units.gu(1)
+                rightMargin: units.gu(1)
+            }
+            height: childrenRect.height
+
+            Repeater {
+                model: attachments
+                delegate: Loader {
+                    id: loader
+                    height: units.gu(8)
+                    source: {
+                        var contentType = getContentType(filePath)
+                        console.log(contentType)
+                        switch(contentType) {
+                        case ContentType.Contacts:
+                            return Qt.resolvedUrl("ThumbnailContact.qml")
+                        case ContentType.Pictures:
+                            return Qt.resolvedUrl("ThumbnailImage.qml")
+                        case ContentType.Videos:
+                            return Qt.resolvedUrl("ThumbnailVideo.qml")
+                        case ContentType.Unknown:
+                            return Qt.resolvedUrl("ThumbnailUnknown.qml")
+                        default:
+                            console.log("unknown content Type")
+                        }
+                    }
+                    onStatusChanged: {
+                        if (status == Loader.Ready) {
+                            item.index = index
+                            item.filePath = filePath
+                        }
+                    }
+
+                    Connections {
+                        target: loader.status == Loader.Ready ? loader.item : null
+                        ignoreUnknownSignals: true
+                        onPressAndHold: {
+                            Qt.inputMethod.hide()
+                            _activeAttachmentIndex = target.index
+                            PopupUtils.open(attachmentPopover, parent)
+                        }
+                    }
+                }
+            }
+        }
+
+        ListItem.ThinDivider {
+            id: divider
+
+            anchors {
+                left: parent.left
+                right: parent.right
+                top: attachmentThumbnails.bottom
+                margins: units.gu(0.5)
+            }
+            visible: attachments.count > 0
+        }
+
+        TextArea {
+            id: messageTextArea
+            objectName: "messageTextArea"
+            anchors {
+                top: attachments.count == 0 ? textEntry.top : attachmentThumbnails.bottom
+                left: parent.left
+                right: parent.right
+            }
+            // this value is to avoid letter being cut off
+            height: units.gu(4.3)
+            style: LocalTextAreaStyle {}
+            autoSize: true
+            maximumLineCount: attachments.count == 0 ? 8 : 4
+            placeholderText: {
+                if (telepathyHelper.ready) {
+                    var account = telepathyHelper.accountForId(presenceRequest.accountId)
+                    if (account && 
+                            (presenceRequest.type != PresenceRequest.PresenceTypeUnknown &&
+                             presenceRequest.type != PresenceRequest.PresenceTypeUnset) &&
+                             account.protocolInfo.serviceName !== "") {
+                        console.log(presenceRequest.accountId)
+                        console.log(presenceRequest.type)
+                        return account.protocolInfo.serviceName
+                    }
+                }
+                return i18n.tr("Write a message...")
+            }
+            focus: textEntry.focus
+            font.family: "Ubuntu"
+            font.pixelSize: FontUtils.sizeToPixels("medium")
+            color: "#5d5d5d"
+        }
+    }
+
+    AttachmentPanel {
+        id: attachmentPanel
+
+        anchors {
+            left: parent.left
+            right: parent.right
+            top: textEntry.bottom
+            topMargin: units.gu(1)
+        }
+
+        Connections {
+            target: composeBar
+            onAudioAttachedChanged: {
+                if (composeBar.audioAttached) {
+                    attachmentPanel.expanded = false;
+                }
+            }
+        }
+
+        onAttachmentAvailable: {
+            attachments.append(attachment)
+            forceFocus()
+        }
+
+        onExpandedChanged: {
+            if (expanded && Qt.inputMethod.visible) {
+                attachmentPanel.forceActiveFocus()
+            }
+        }
+    }
+
+    Loader {
+        id: stickersPicker
+        property bool expanded: false
+        height: expanded ? item.height : 0
+        active: false
+        sourceComponent: stickersPickerComponent
+        anchors {
+            left: parent.left
+            right: parent.right
+            top: textEntry.bottom
+        }
+        onExpandedChanged: {
+            if (expanded) {
+               stickersPicker.active = expanded
+            }
+            if (active) {
+                item.expanded = expanded
+            }
+        }
+    }
+
+    Component {
+        id: stickersPickerComponent
+        StickersPicker {
+            id: stickersPicker1
+
+            onExpandedChanged: {
+                if (expanded && Qt.inputMethod.visible) {
+                    stickersPicker1.forceActiveFocus()
+                }
+            }
+
+            onStickerSelected: {
+                if (!canSend) {
+                    // FIXME: show a dialog saying what we need to do to be able to send
+                    return
+                }
+
+                var attachment = {}
+                var filePath = String(path).replace('file://', '')
+                attachment["contentType"] = application.fileMimeType(filePath)
+                attachment["name"] = filePath.split('/').reverse()[0]
+                attachment["filePath"] = filePath
+
+                // we need to append the attachment to a ListModel, so create it dynamically
+                var attachments = Qt.createQmlObject("import QtQuick 2.0; ListModel { }", composeBar)
+                attachments.append(attachment)
+                composeBar.sendRequested("", attachments)
+                stickersPicker.expanded = false
+            }
+        }
+    }
+
+    TransparentButton {
+        id: sendButton
+        objectName: "sendButton"
+        anchors.verticalCenter: textEntry.verticalCenter
+        anchors.right: parent.right
+        anchors.rightMargin: units.gu(2)
+        iconSource: Qt.resolvedUrl("./assets/send.svg")
+        enabled: (canSend && (textEntry.text != "" || textEntry.inputMethodComposing || attachments.count > 0))
+        opacity: textEntry.text != "" || textEntry.inputMethodComposing || attachments.count > 0 ? 1.0 : 0.0
+        Behavior on opacity { UbuntuNumberAnimation {} }
+        visible: opacity > 0
+
+        onClicked: {
+            // make sure we flush everything we have prepared in the OSK preedit
+            Qt.inputMethod.commit();
+            if (textEntry.text == "" && attachments.count == 0) {
+                return
+            }
+
+            if (composeBar.audioAttached) {
+                textEntry.text = ""
+            }
+
+            composeBar.sendRequested(textEntry.text, attachments)
+        }
+    }
+
+    TransparentButton {
+        id: recordButton
+        objectName: "recordButton"
+
+        anchors {
+            verticalCenter: textEntry.verticalCenter
+            right: parent.right
+            rightMargin: units.gu(2)
+        }
+
+        opacity: textEntry.text != "" || textEntry.inputMethodComposing || attachments.count > 0 ? 0.0 : 1.0
+        Behavior on opacity { UbuntuNumberAnimation {} }
+        visible: opacity > 0
+
+        iconColor: composeBar.recording ? "black" : "gray"
+        iconName: "audio-input-microphone-symbolic"
+
+        onPressed: audioRecordingBar.startRecording()
+        onReleased: {
+            audioRecordingBar.stopRecording()
+
+            // if dragged past the threshold, cancel
+            if (dragTarget.dragAmount >= 0.5) {
+                composeBar.reset()
+            }
+        }
+
+        // drag-to-cancel
+        drag.target: dragTarget
+        drag.axis: Drag.XAxis
+        drag.minimumX: (leftSideActions.x + leftSideActions.width)
+        drag.maximumX: recordButton.x
+
+    }
+}

=== renamed file 'src/qml/PictureImport.qml' => 'src/qml/ContentImport.qml'
--- src/qml/PictureImport.qml	2015-09-14 13:51:27 +0000
+++ src/qml/ContentImport.qml	2016-01-14 12:41:18 +0000
@@ -24,17 +24,33 @@
 
     property var importDialog: null
 
-    signal pictureReceived(string pictureUrl)
+    signal contentReceived(string contentUrl)
 
-    function requestNewPicture()
-    {
+    function requestContent(contentType) {
         if (!root.importDialog) {
             root.importDialog = PopupUtils.open(contentHubDialog, root)
+            root.importDialog.contentType = contentType
         } else {
             console.warn("Import dialog already running")
         }
     }
 
+    function requestPicture() {
+        requestContent(ContentHub.ContentType.Pictures)
+    }
+
+    function requestVideo() {
+        requestContent(ContentHub.ContentType.Videos)
+    }
+
+    function requestContact() {
+        requestContent(ContentHub.ContentType.Contacts)
+    }
+
+    function requestDocument() {
+        requestContent(ContentHub.ContentType.Documents)
+    }
+
     Component {
         id: contentHubDialog
 
@@ -42,6 +58,7 @@
             id: dialogue
 
             property alias activeTransfer: signalConnections.target
+            property alias contentType: peerPicker.contentType
 
             focus: true
             Rectangle {
@@ -76,7 +93,7 @@
                     if (dialogue.activeTransfer.state === ContentHub.ContentTransfer.Charged) {
                         dialogue.hide()
                         if (dialogue.activeTransfer.items.length > 0) {
-                            root.pictureReceived(dialogue.activeTransfer.items[0].url)
+                            root.contentReceived(dialogue.activeTransfer.items[0].url)
                         }
                     }
 

=== added file 'src/qml/DeliveryStatus.qml'
--- src/qml/DeliveryStatus.qml	1970-01-01 00:00:00 +0000
+++ src/qml/DeliveryStatus.qml	2016-01-14 12:41:18 +0000
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2015 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.History 0.1
+
+Image {
+    property int messageStatus: -1
+    enabled: true
+    height: enabled ? units.gu(1) : 0
+    width: enabled ? undefined : 0
+    fillMode: Image.PreserveAspectFit
+    source: {
+        if (!enabled) {
+            return ""
+        }
+        if (messageStatus == HistoryThreadModel.MessageStatusDelivered) {
+            return Qt.resolvedUrl("./assets/single_tick.svg")
+        } else if (messageStatus == HistoryThreadModel.MessageStatusRead) {
+            return Qt.resolvedUrl("./assets/double_tick.svg")
+        }
+        return ""
+    }
+}

=== added file 'src/qml/Dialogs/FileSizeWarningDialog.qml'
--- src/qml/Dialogs/FileSizeWarningDialog.qml	1970-01-01 00:00:00 +0000
+++ src/qml/Dialogs/FileSizeWarningDialog.qml	2016-01-14 12:41:18 +0000
@@ -0,0 +1,70 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This file is part of messaging-app.
+ *
+ * dialer-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.
+ *
+ * dialer-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.3
+import Ubuntu.Components.Popups 1.3
+
+Component {
+    Dialog {
+        id: dialogue
+        title: i18n.tr("File size warning")
+        Column {
+            anchors.left: parent.left
+            anchors.right: parent.right
+            spacing: units.gu(2)
+
+            Label {
+                anchors.left: parent.left
+                anchors.right: parent.right
+                height: paintedHeight
+                verticalAlignment: Text.AlignVCenter
+                text: i18n.tr("You are trying to send big files (over 300Kb). Some operators might not be able to send it.")
+                wrapMode: Text.WordWrap
+            }
+            Row {
+                spacing: units.gu(4)
+                anchors.horizontalCenter: parent.horizontalCenter
+                Button {
+                    objectName: "okFileSizeWarningDialog"
+                    text: i18n.tr("Ok")
+                    color: UbuntuColors.orange
+                    onClicked: {
+                        PopupUtils.close(dialogue)
+                    }
+                }
+            }
+
+            Row {
+                CheckBox {
+                    id: dontAskAgainCheckbox
+                    checked: false
+                    onCheckedChanged: settings.messagesDontShowFileSizeWarning = checked
+                }
+                Label {
+                    text: i18n.tr("Don't show 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-08-11 22:59:14 +0000
+++ src/qml/KeyboardRectangle.qml	2016-01-14 12:41:18 +0000
@@ -17,6 +17,7 @@
  */
 
 import QtQuick 2.2
+import GSettings 1.0
 
 Item {
     id: keyboardRect
@@ -25,6 +26,8 @@
     anchors.bottom: parent.bottom
     height: Qt.inputMethod.visible ? Qt.inputMethod.keyboardRectangle.height : 0
 
+    property bool oskEnabled: !gsettings.stayHidden
+
     function recursiveFindFocusedItem(parent) {
         if (parent.activeFocus) {
             return parent;
@@ -58,4 +61,9 @@
             }
         }
     }
+
+    GSettings {
+        id: gsettings
+        schema.id: "com.canonical.keyboard.maliit"
+    }
 }

=== modified file 'src/qml/LocalPageWithBottomEdge.qml'
--- src/qml/LocalPageWithBottomEdge.qml	2015-09-14 13:51:27 +0000
+++ src/qml/LocalPageWithBottomEdge.qml	2016-01-14 12:41:18 +0000
@@ -105,7 +105,7 @@
     {
         if (edgeLoader.status === Loader.Ready) {
             edgeLoader.item.active = true
-            page.pageStack.push(edgeLoader.item)
+            page.pageStack.addPageToNextColumn(page, edgeLoader.item)
             if (edgeLoader.item.flickable) {
                 edgeLoader.item.flickable.contentY = -page.header.height
                 edgeLoader.item.flickable.returnToBounds()
@@ -162,6 +162,7 @@
         property bool hidden: (activeFocus === false) || ((bottomEdge.y - units.gu(1)) < tip.y)
 
         enabled: mouseArea.enabled
+        visible: bottomEdgeEnabled
         anchors {
             bottom: parent.bottom
             horizontalCenter: bottomEdge.horizontalCenter
@@ -233,7 +234,7 @@
             minimumY: bottomEdge.pageStartY
             maximumY: page.height
         }
-        enabled: edgeLoader.status == Loader.Ready
+        enabled: bottomEdgeEnabled && edgeLoader.status == Loader.Ready
 
         anchors {
             left: parent.left

=== added file 'src/qml/MMS/MMSAudio.qml'
--- src/qml/MMS/MMSAudio.qml	1970-01-01 00:00:00 +0000
+++ src/qml/MMS/MMSAudio.qml	2016-01-14 12:41:18 +0000
@@ -0,0 +1,200 @@
+/*
+ * Copyright 2015 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 QtMultimedia 5.0
+import Ubuntu.Components 1.3
+import Ubuntu.Components.Themes.Ambiance 1.3
+import messagingapp.private 0.1
+import ".."
+import "../dateUtils.js" as DateUtils
+
+MMSBase {
+    id: audioDelegate
+
+    height: units.gu(5)
+    width: units.gu(28)
+    property string textColor: incoming ? "#5D5D5D" : "#FFFFFF"
+    swipeLocked: audioPlayer.playing
+
+    onAttachmentChanged: {
+        var tmpFile = FileOperations.getTemporaryFile(".ogg")
+        if (FileOperations.link(attachment.filePath, tmpFile)) {
+            audioPlayer.source = tmpFile;
+        } else {
+            console.log("MMSAudio: Failed to link", attachment.filePath, "to", tmpFile)
+        }
+    }
+
+    Rectangle {
+        id: shape
+        radius: units.gu(1)
+        smooth: true
+        anchors.top: parent.top
+        width: parent.width
+        height: parent.height
+        color: incoming ? "#FFFFFF" : "#3fb24f"
+        border.color: incoming ? "#888888" : "transparent"
+    }
+
+    Loader {
+        id: audioPlayer
+        readonly property bool playing: ready ? item.playing : false
+        readonly property bool paused: ready ? item.paused : false
+        readonly property bool stopped: ready ? item.stopped : false
+        readonly property int position: ready ? item.position : 0
+        readonly property int duration: ready ? item.duration : 0
+        readonly property bool ready: status == Loader.Ready
+        readonly property int playbackState: ready ? item.playbackState : Audio.StoppedState
+        property bool muted: false
+        property string source: ""
+        function play() { 
+            audioPlayer.active = true
+            item.play() 
+        }
+        function stop() {
+            item.stop()
+            audioPlayer.active = false
+            audioPlayer.muted = false
+        }
+        function pause() { item.pause() }
+        function seek(pos) { item.seek(pos) }
+        active: false
+        sourceComponent: audioPlayerComponent
+    }
+
+    Component {
+        id: audioPlayerComponent
+        Audio {
+            id: audioPlayer1
+            objectName: "audioPlayer"
+            readonly property bool playing: audioPlayer1.playbackState == Audio.PlayingState
+            readonly property bool paused: audioPlayer1.playbackState == Audio.PausedState
+            readonly property bool stopped: audioPlayer1.playbackState == Audio.StoppedState
+            source: audioPlayer.source
+            muted: audioPlayer.muted
+        }
+    }
+
+
+    TransparentButton {
+        id: playButton
+        objectName: "playButton"
+
+        anchors {
+            left: parent.left
+            leftMargin: units.gu(1)
+            verticalCenter: shape.verticalCenter
+        }
+
+        spacing: units.gu(1)
+        sideBySide: true
+        enabled: audioPlayer.source != ""
+        iconColor: audioDelegate.textColor
+        iconName: audioPlayer.playing ? "media-playback-pause" : "media-playback-start"
+
+        textSize: FontUtils.sizeToPixels("x-small")
+        textColor: audioDelegate.textColor
+        text: {
+            if (audioPlayer.playing || audioPlayer.paused) {
+                return DateUtils.formattedTime(audioPlayer.position/ 1000)
+            }
+            if (audioPlayer.duration > 0) {
+                return DateUtils.formattedTime(audioPlayer.duration / 1000)
+            }
+            return ""
+        }
+
+        onClicked: {
+            if (audioPlayer.playing) {
+                audioPlayer.pause()
+            } else {
+                audioPlayer.play()
+            }
+        }
+    }
+
+    Slider {
+        id: slider
+        Connections {
+            target: audioPlayer
+            onDurationChanged: {
+                if (slider.maximumValue == 100) {
+                    slider.maximumValue = audioPlayer.duration
+                }
+            }
+        }
+        style: SliderStyle {
+            Component.onCompleted: thumb.visible = false
+            Connections {
+                target: audioPlayer
+                onPlaybackStateChanged: {
+                    thumb.visible = !audioPlayer.stopped
+                    if (!thumb.visible) {
+                        audioPlayer.seek(0)
+                    }
+                }
+            }
+        }
+        enabled: !audioPlayer.stopped
+        function formatValue(v) { return DateUtils.formattedTime(v/1000) }
+        anchors {
+            left: playButton.right
+            right: deliveryStatus.left
+            leftMargin: units.gu(1)
+            rightMargin: units.gu(2)
+            verticalCenter: shape.verticalCenter
+        }
+        height: units.gu(3)
+        minimumValue: 0.0
+        maximumValue: 100
+        value: audioPlayer.position
+        activeFocusOnPress: false
+        onPressedChanged: {
+            if (!pressed) {
+                if (audioPlayer.playing || audioPlayer.paused) {
+                    audioPlayer.seek(value)
+                } else {
+                    audioPlayer.muted = true
+                    // we only get the duration while playing
+                    audioPlayer.play()
+                    audioPlayer.pause()
+                    if (audioPlayer.duration == 100) {
+                        audioPlayer.seek((audioPlayer.duration*value)/100)
+                    } else {
+                        audioPlayer.seek(value)
+                    }
+                    audioPlayer.muted = false
+                    
+                }
+                value = Qt.binding(function(){ return audioPlayer.position})
+            }
+        }
+    }
+
+    DeliveryStatus {
+       id: deliveryStatus
+       messageStatus: textMessageStatus
+       enabled: showDeliveryStatus
+       anchors {
+           right: parent.right
+           rightMargin: units.gu(0.5)
+           verticalCenter: slider.verticalCenter
+       }
+    }
+}

=== modified file 'src/qml/MMS/MMSBase.qml'
--- src/qml/MMS/MMSBase.qml	2014-08-19 18:41:57 +0000
+++ src/qml/MMS/MMSBase.qml	2016-01-14 12:41:18 +0000
@@ -23,4 +23,6 @@
     property var attachment
     property string previewer
     property bool lastItem: false
+    property bool swipeLocked: false
+    property bool showDeliveryStatus: true
 }

=== modified file 'src/qml/MMS/MMSContact.qml'
--- src/qml/MMS/MMSContact.qml	2015-11-19 13:37:36 +0000
+++ src/qml/MMS/MMSContact.qml	2016-01-14 12:41:18 +0000
@@ -20,6 +20,7 @@
 import Ubuntu.Components 1.3
 import Ubuntu.Contacts 0.1
 import Ubuntu.History 0.1
+import ".."
 
 MMSBase {
     id: vcardDelegate
@@ -76,8 +77,8 @@
                 return "#3fb24f"
             }
         }
-        border.color: "#ACACAC"
-        radius: height * 0.1
+        border.color: incoming ? "#ACACAC" : "transparent"
+        radius: units.gu(1)
 
         ContactAvatar {
             id: avatar
@@ -132,4 +133,16 @@
 
         vCardUrl: attachment ? Qt.resolvedUrl(attachment.filePath) : ""
     }
+
+    DeliveryStatus {
+       id: deliveryStatus
+       messageStatus: textMessageStatus
+       enabled: showDeliveryStatus
+       anchors {
+           right: parent.right
+           rightMargin: units.gu(0.5)
+           bottom: parent.bottom
+           bottomMargin: units.gu(0.5)
+       }
+    }
 }

=== modified file 'src/qml/MMS/MMSImage.qml'
--- src/qml/MMS/MMSImage.qml	2015-09-14 13:51:27 +0000
+++ src/qml/MMS/MMSImage.qml	2016-01-14 12:41:18 +0000
@@ -18,6 +18,7 @@
 
 import QtQuick 2.2
 import Ubuntu.Components 1.3
+import ".."
 
 MMSBase {
     id: imageDelegate
@@ -34,6 +35,7 @@
 
         image: Image {
             id: imageAttachment
+            objectName: "imageAttachment"
 
             fillMode: Image.PreserveAspectCrop
             smooth: true
@@ -83,4 +85,16 @@
             }
         }
     }
+
+    DeliveryStatus {
+       id: deliveryStatus
+       messageStatus: textMessageStatus
+       enabled: showDeliveryStatus
+       anchors {
+           right: parent.right
+           rightMargin: units.gu(0.5)
+           bottom: parent.bottom
+           bottomMargin: units.gu(0.5)
+       }
+    }
 }

=== modified file 'src/qml/MMS/MMSVideo.qml'
--- src/qml/MMS/MMSVideo.qml	2015-09-14 13:51:27 +0000
+++ src/qml/MMS/MMSVideo.qml	2016-01-14 12:41:18 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012, 2013, 2014 Canonical Ltd.
+ * Copyright 2012-2015 Canonical Ltd.
  *
  * This file is part of messaging-app.
  *
@@ -18,65 +18,95 @@
 
 import QtQuick 2.2
 import Ubuntu.Components 1.3
-import QtMultimedia 5.0
+import Ubuntu.Thumbnailer 0.1
 import ".."
 
 MMSBase {
     id: videoDelegate
 
     previewer: "MMS/PreviewerVideo.qml"
-    anchors.left: parent.left
-    anchors.right: parent.right
-    height: bubble.height + units.gu(1)
+    height: videoAttachment.height
+    width: videoAttachment.width
 
-    Item {
+    UbuntuShape {
         id: bubble
         anchors.top: parent.top
-        width: videoOutput.width + units.gu(3)
-        height: videoOutput.height + units.gu(2)
-
-        MediaPlayer {
-            id: video
-            autoLoad: true
-            autoPlay: false
-            source: attachment.filePath
-            onStatusChanged: {
-                if (status === MediaPlayer.Loaded) {
-                    // FIXME: there is no way to show the thumbnail
-                    video.play(); video.stop();
-
-                    // resize videoOutput, as width is not set
-                    // properly when using PreserveAspectFit
-                    if (videoOutput.height > units.gu(25)) {
-                        var percentageResized = units.gu(25)*100/(metaData.resolution.height)
-                        videoOutput.height = units.gu(25)
-                        videoOutput.width = (metaData.resolution.width*percentageResized)/100
-                    }
-                    if (videoOutput.width > units.gu(35)) {
-                        percentageResized = units.gu(35)*100/(metaData.resolution.width)
-                        videoOutput.width = units.gu(35)
-                        videoOutput.height = (metaData.resolution.height*percentageResized)/100
-                    }
+        width: image.width
+        height: image.height
+
+        image: Image {
+            id: videoAttachment
+            objectName: "videoAttachment"
+
+            fillMode: Image.PreserveAspectCrop
+            smooth: true
+            source: "image://thumbnailer/" + attachment.filePath
+            visible: false
+            asynchronous: true
+            height: Math.min(implicitHeight, units.gu(14))
+            width: Math.min(implicitWidth, units.gu(27))
+            cache: false
+
+            sourceSize.width: units.gu(27)
+            sourceSize.height: units.gu(27)
+
+            onStatusChanged:  {
+                if (status === Image.Error) {
+                    source = "image://theme/image-missing"
+                    width = 128
+                    height = 128
                 }
             }
         }
-        VideoOutput {
-            id: videoOutput
-            source: video
+
+        Icon {
+            objectName: "playbackStartIcon"
+            width: units.gu(3)
+            height: units.gu(3)
             anchors.centerIn: parent
-            anchors.horizontalCenterOffset: incoming ? units.gu(0.5) : -units.gu(0.5)
+            name: "media-playback-start"
+            color: "white"
+            opacity: 0.8
         }
 
         Rectangle {
-            color: "black"
-            opacity: 0.8
-            anchors.fill: videoOutput
-            Icon {
-                name: "media-playback-start"
-                width: units.gu(4)
-                height: units.gu(4)
-                anchors.centerIn: parent
+            visible: videoDelegate.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.formatTime(timestamp).toLowerCase()
+                color: "white"
             }
         }
     }
+
+    DeliveryStatus {
+       id: deliveryStatus
+       messageStatus: textMessageStatus
+       enabled: showDeliveryStatus
+       anchors {
+           right: parent.right
+           rightMargin: units.gu(0.5)
+           bottom: parent.bottom
+           bottomMargin: units.gu(0.5)
+       }
+    }
+
 }

=== modified file 'src/qml/MMS/Previewer.qml'
--- src/qml/MMS/Previewer.qml	2015-11-17 14:39:21 +0000
+++ src/qml/MMS/Previewer.qml	2016-01-14 12:41:18 +0000
@@ -109,11 +109,11 @@
 
             onPeerSelected: {
                 picker.curTransfer = peer.request();
-                mainStack.pop();
+                mainStack.removePages(picker);
                 if (picker.curTransfer.state === ContentTransfer.InProgress)
                     picker.__exportItems(picker.url);
             }
-            onCancelPressed: mainStack.pop();
+            onCancelPressed: mainStack.removePages(picker);
         }
 
         Connections {

=== modified file 'src/qml/MMS/PreviewerImage.qml'
--- src/qml/MMS/PreviewerImage.qml	2015-09-14 13:51:27 +0000
+++ src/qml/MMS/PreviewerImage.qml	2016-01-14 12:41:18 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012, 2013, 2014 Canonical Ltd.
+ * Copyright 2012-2015 Canonical Ltd.
  *
  * This file is part of messaging-app.
  *
@@ -19,18 +19,193 @@
 import QtQuick 2.2
 import Ubuntu.Components 1.3
 import Ubuntu.Content 0.1
+import Ubuntu.Thumbnailer 0.1
 import ".."
 
 Previewer {
+    id: imagePreviewer
+
+    Component.onCompleted: application.fullscreen = true
+    Component.onDestruction: application.fullscreen = false
+
+    Connections {
+        target: application
+        onFullscreenChanged: imagePreviewer.head.visible = !application.fullscreen
+    }
+
     title: i18n.tr("Image Preview")
     clip: true
-    Image {
-        anchors.centerIn: parent
+
+    Rectangle {
         anchors.fill: parent
-        fillMode: Image.PreserveAspectFit
-        source: attachment.filePath
-        cache: false
-        sourceSize.width: parent.width
-        sourceSize.height: parent.height
+        color: "black"
+    } 
+
+    Item {
+        id: imageItem
+        property bool pinchInProgress: zoomPinchArea.active
+        property size thumbSize: Qt.size(viewer.width * 1.05, viewer.height * 1.05)
+
+        onWidthChanged: {
+            // Only change thumbSize if width increases more than 5%
+            // that way we do not reload image for small resizes
+            if (width > thumbSize.width) {
+                thumbSize = Qt.size(width * 1.05, height * 1.05);
+            }
+        }
+
+        onHeightChanged: {
+            // Only change thumbSize if height increases more than 5%
+            // that way we do not reload image for small resizes
+            if (height > thumbSize.height) {
+                thumbSize = Qt.size(width * 1.05, height * 1.05);
+            }
+        }
+
+        function zoomIn(centerX, centerY, factor) {
+            flickable.scaleCenterX = centerX / (flickable.sizeScale * flickable.width);
+            flickable.scaleCenterY = centerY / (flickable.sizeScale * flickable.height);
+            flickable.sizeScale = factor;
+        }
+
+        function zoomOut() {
+            if (flickable.sizeScale != 1.0) {
+                flickable.scaleCenterX = flickable.contentX / flickable.width / (flickable.sizeScale - 1);
+                flickable.scaleCenterY = flickable.contentY / flickable.height / (flickable.sizeScale - 1);
+                flickable.sizeScale = 1.0;
+            }
+        }
+
+        width: parent.width
+        height: parent.height
+
+        ActivityIndicator {
+            objectName: "imageActivityIndicator"
+            anchors.centerIn: parent
+            visible: running
+            running: image.status != Image.Ready
+        }
+
+        PinchArea {
+            id: zoomPinchArea
+            anchors.fill: parent
+
+            property real initialZoom
+            property real maximumScale: 3.0
+            property real minimumZoom: 1.0
+            property real maximumZoom: 3.0
+            property bool active: false
+            property var center
+
+            onPinchStarted: {
+                active = true;
+                initialZoom = flickable.sizeScale;
+                center = zoomPinchArea.mapToItem(media, pinch.startCenter.x, pinch.startCenter.y);
+                imageItem.zoomIn(center.x, center.y, initialZoom);
+            }
+            onPinchUpdated: {
+                var zoomFactor = MathUtils.clamp(initialZoom * pinch.scale, minimumZoom, maximumZoom);
+                flickable.sizeScale = zoomFactor;
+            }
+            onPinchFinished: {
+                active = false;
+            }
+
+            Flickable {
+                id: flickable
+                anchors.fill: parent
+                contentWidth: media.width
+                contentHeight: media.height
+                contentX: (sizeScale - 1) * scaleCenterX * width
+                contentY: (sizeScale - 1) * scaleCenterY * height
+                interactive: !imageItem.pinchInProgress
+
+                property real sizeScale: 1.0
+                property real scaleCenterX: 0.0
+                property real scaleCenterY: 0.0
+
+                Behavior on sizeScale {
+                    enabled: !imageItem.pinchInProgress
+                    UbuntuNumberAnimation {duration: UbuntuAnimation.FastDuration}
+                }
+                Behavior on scaleCenterX {
+                    UbuntuNumberAnimation {duration: UbuntuAnimation.FastDuration}
+                }
+                Behavior on scaleCenterY {
+                    UbuntuNumberAnimation {duration: UbuntuAnimation.FastDuration}
+                }
+
+                Item {
+                    id: media
+
+                    width: flickable.width * flickable.sizeScale
+                    height: flickable.height * flickable.sizeScale
+
+                    Image {
+                        id: image
+                        objectName: "thumbnailImage"
+                        anchors.fill: parent
+                        asynchronous: true
+                        cache: false
+                        source: "image://thumbnailer/%1".arg(attachment.filePath.toString())
+                        sourceSize {
+                            width: imageItem.thumbSize.width
+                            height: imageItem.thumbSize.height
+                        }
+                        fillMode: Image.PreserveAspectFit
+                        opacity: status == Image.Ready ? 1.0 : 0.0
+                        Behavior on opacity { UbuntuNumberAnimation {duration: UbuntuAnimation.FastDuration} }
+                    }
+
+                    Image {
+                        id: highResolutionImage
+                        objectName: "highResolutionImage"
+                        anchors.fill: parent
+                        asynchronous: true
+                        cache: false
+                        source: flickable.sizeScale > 1.0 ? attachment.filePath : ""
+                        sourceSize {
+                            width: width
+                            height: height
+                        }
+                        fillMode: Image.PreserveAspectFit
+                    }
+                }
+
+                MouseArea {
+                    id: imageMouseArea
+                    anchors.fill: parent
+
+                    property bool clickAccepted: false
+
+                    onDoubleClicked: {
+                        if (imageMouseArea.clickAccepted) {
+                            return
+                        }
+
+                        clickTimer.stop()
+
+                        if (flickable.sizeScale < zoomPinchArea.maximumZoom) {
+                            imageItem.zoomIn(mouse.x, mouse.y, zoomPinchArea.maximumZoom);
+                        } else {
+                            imageItem.zoomOut();
+                        }
+                    }
+                    onClicked: {
+                        imageMouseArea.clickAccepted = false
+                        clickTimer.start()
+                    }
+                }
+
+                Timer {
+                    id: clickTimer
+                    interval: 200
+                    onTriggered: {
+                        imageMouseArea.clickAccepted = true
+                        application.fullscreen = !application.fullscreen
+                    }
+                }
+            }
+        }
     }
 }

=== modified file 'src/qml/MMS/PreviewerVideo.qml'
--- src/qml/MMS/PreviewerVideo.qml	2015-09-14 13:51:27 +0000
+++ src/qml/MMS/PreviewerVideo.qml	2016-01-14 12:41:18 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012, 2013, 2014 Canonical Ltd.
+ * Copyright 2012-2015 Canonical Ltd.
  *
  * This file is part of messaging-app.
  *
@@ -17,61 +17,152 @@
  */
 
 import QtQuick 2.2
+import QtMultimedia 5.0
 import Ubuntu.Components 1.3
-import QtMultimedia 5.0
+import Ubuntu.Content 0.1
+import Ubuntu.Thumbnailer 0.1
+import messagingapp.private 0.1
 import ".."
 
 Previewer {
+    id: videoPreviewer
+
     title: i18n.tr("Video Preview")
-    // This previewer implements only basic video controls: play/pause/rewind
-    onActionTriggered: video.pause()
-    MediaPlayer {
-        id: video
-        autoLoad: true
-        autoPlay: true
-        source: attachment.filePath
-    }
-    VideoOutput {
-        id: videoOutput
-        source: video
-        anchors.fill: parent
+    clip: true
+
+    Component.onCompleted: {
+        application.fullscreen = true
+        // Load Video player after toggling fullscreen to reduce flickering
+        videoLoader.active = true
+    }
+    Component.onDestruction: application.fullscreen = false
+
+    Connections {
+        target: application
+        onFullscreenChanged: {
+            videoPreviewer.head.visible = !application.fullscreen
+            toolbar.collapsed = application.fullscreen
+        }
+    }
+
+    Rectangle {
+        anchors.fill: parent
+        color: "black"
+    }
+
+    Loader {
+        id: videoLoader
+
+        anchors.fill: parent
+        active: false
+        sourceComponent: videoComponent
+
+        onStatusChanged: {
+            if (status == Loader.Ready) {
+                var tmpFile = FileOperations.getTemporaryFile(".mp4")
+                if (FileOperations.link(attachment.filePath, tmpFile)) {
+                    videoLoader.item.source = tmpFile
+                } else {
+                    console.log("MMSVideo: Failed to link", attachment.filePath, "to", tmpFile)
+                }
+            }
+        }
+
+        Component {
+            id: videoComponent
+
+            Item {
+                id: videoPlayer
+                objectName: "videoPlayer"
+
+                property alias source: player.source
+                property alias playbackState: player.playbackState
+
+                function play() { player.play() }
+                function pause() { player.pause() }
+                function stop() { player.stop() }
+ 
+                anchors.fill: parent
+
+                MediaPlayer {
+                    id: player
+                    autoPlay: true
+                }
+
+                VideoOutput {
+                    id: videoOutput
+                    anchors.fill: parent
+                    source: player
+                }
+            }
+        }
     }
 
     MouseArea {
-        id: playArea
-        anchors.fill: parent
-        onPressed: {
-            if (video.playbackState === MediaPlayer.PlayingState) {
-                video.pause()
-            }
+        anchors {
+            top: parent.top
+            bottom: toolbar.top
+            left: parent.left
+            right: parent.right
         }
+        onClicked: application.fullscreen = !application.fullscreen
     }
 
     Rectangle {
-        color: "black"
-        visible: video.playbackState !== MediaPlayer.PlayingState
+        id: toolbar
+        objectName: "toolbar"
+
+        property bool collapsed: false
+
+        anchors.bottom: parent.bottom
+
+        width: parent.width
+        height: collapsed ? 0 : units.gu(7)
+        Behavior on height { UbuntuNumberAnimation {} }
+
+        color: "gray"
         opacity: 0.8
-        anchors.fill: videoOutput
+
         Row {
-            anchors.centerIn: parent
+            anchors {
+                top: parent.top
+                bottom: parent.bottom
+                horizontalCenter: parent.horizontalCenter
+            }
+
+            spacing: units.gu(2)
+
             Icon {
-                name: "media-playback-pause"
-                width: units.gu(5)
-                height: units.gu(5)
+                anchors.verticalCenter: parent.verticalCenter
+                width: toolbar.collapsed ? 0 : units.gu(5)
+                height: width
+                Behavior on width { UbuntuNumberAnimation {} }
+                Behavior on height { UbuntuNumberAnimation {} }
+                name: videoLoader.item && videoLoader.item.playbackState == MediaPlayer.PlayingState ? "media-playback-pause" : "media-playback-start"
+                color: "white"
                 MouseArea {
                     anchors.fill: parent
-                    onClicked: video.play();
+                    onClicked: {
+                        if (videoLoader.item.playbackState == MediaPlayer.PlayingState) {
+                            videoLoader.item.pause()
+                        } else {
+                            videoLoader.item.play()
+                        }
+                    }
                 }
             }
             Icon {
-                name: "media-seek-backward"
-                width: units.gu(5)
-                height: units.gu(5)
+                anchors.verticalCenter: parent.verticalCenter
+                width: toolbar.collapsed ? 0 : units.gu(5)
+                height: width
+                Behavior on width { UbuntuNumberAnimation {} }
+                Behavior on height { UbuntuNumberAnimation {} }
+                name: "media-playback-stop"
+                color: "white"
                 MouseArea {
                     anchors.fill: parent
                     onClicked: {
-                        video.stop();
-                        video.play();
+                        videoLoader.item.stop()
                     }
                 }
             }

=== modified file 'src/qml/MMSDelegate.qml'
--- src/qml/MMSDelegate.qml	2015-11-23 19:51:16 +0000
+++ src/qml/MMSDelegate.qml	2016-01-14 12:41:18 +0000
@@ -27,6 +27,15 @@
     property var dataAttachments: []
     property var textAttachements: []
     property string messageText: ""
+    swipeLocked: {
+        for (var i=0; i < attachmentsView.children.length; i++) {
+            if (attachmentsView.children[i].item && !attachmentsView.children[i].item.swipeLocked) {
+                return false
+            }
+        }
+        return true
+    }
+
 
     function clicked(mouse)
     {
@@ -36,7 +45,7 @@
             var properties = {}
             properties["attachment"] = attachment.item.attachment
             properties["thumbnail"] = attachment.item
-            mainStack.push(Qt.resolvedUrl(attachment.item.previewer), properties)
+            mainStack.addPageToCurrentColumn(messages, Qt.resolvedUrl(attachment.item.previewer), properties)
         }
     }
 
@@ -82,17 +91,16 @@
             var attachment = attachments[i]
             if (startsWith(attachment.contentType, "text/plain") ) {
                 root.textAttachements.push(attachment)
+            } else if (startsWith(attachment.contentType, "audio/")) {
+                root.dataAttachments.push({"type": "audio",
+                                      "data": attachment,
+                                      "delegateSource": "MMS/MMSAudio.qml",
+                                    })
             } else if (startsWith(attachment.contentType, "image/")) {
                 root.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")) {
                 // smil files will always be ignored here
@@ -102,6 +110,11 @@
                                       "data": attachment,
                                       "delegateSource": "MMS/MMSContact.qml"
                                     })
+            } else if (startsWith(attachment.contentType, "video/")) {
+                root.dataAttachments.push({"type": "video",
+                                      "data": attachment,
+                                      "delegateSource": "MMS/MMSVideo.qml",
+                                    })
             } else {
                 root.dataAttachments.push({"type": "default",
                                       "data": attachment,
@@ -150,11 +163,6 @@
                             target: attachmentLoader
                             anchors.left: parent ? parent.left : undefined
                         }
-                        PropertyChanges {
-                            target: attachmentLoader
-                            anchors.leftMargin: units.gu(1)
-                            anchors.rightMargin: 0
-                        }
                     },
                     State {
                         when: !root.incoming
@@ -163,11 +171,6 @@
                             target: attachmentLoader
                             anchors.right: parent ? parent.right : undefined
                         }
-                        PropertyChanges {
-                            target: attachmentLoader
-                            anchors.leftMargin: 0
-                            anchors.rightMargin: units.gu(1)
-                        }
                     }
                 ]
                 source: modelData.delegateSource
@@ -221,7 +224,7 @@
                 target: bubbleLoader.item
                 property: "sender"
                 value: messageData.sender.alias !== "" ? messageData.sender.alias : messageData.senderId
-                when: participants.length > 1 && bubbleLoader.status === Loader.Ready && messageData.senderId !== "self"
+                when: messageData.participants.length > 1 && bubbleLoader.status === Loader.Ready && messageData.senderId !== "self"
             }
         }
     }

=== modified file 'src/qml/MMSMessageBubble.qml'
--- src/qml/MMSMessageBubble.qml	2014-08-27 16:05:37 +0000
+++ src/qml/MMSMessageBubble.qml	2016-01-14 12:41:18 +0000
@@ -25,6 +25,7 @@
     messageStatus: messageData.textMessageStatus
     messageIncoming: incoming
     accountName: accountLabel
+    showDeliveryStatus: true
 
     states: [
         State {

=== modified file 'src/qml/MainPage.qml'
--- src/qml/MainPage.qml	2015-10-30 13:21:59 +0000
+++ src/qml/MainPage.qml	2016-01-14 12:41:18 +0000
@@ -33,11 +33,7 @@
         threadList.startSelection()
     }
 
-    state: selectionMode ? "select" : searching ? "search" : "default"
-    title: selectionMode ? " " : i18n.tr("Messages")
-    flickable: null
-
-    bottomEdgeEnabled: !selectionMode && !searching
+    bottomEdgeEnabled: !selectionMode && !searching && !mainView.dualPanel
     bottomEdgeTitle: i18n.tr("+")
     bottomEdgePageComponent: Messages { active: false }
 
@@ -46,6 +42,8 @@
         objectName: "searchField"
         visible: mainPage.searching
         anchors {
+            top: parent.top
+            topMargin: units.gu(1)
             left: parent.left
             right: parent.right
             rightMargin: units.gu(2)
@@ -60,11 +58,32 @@
         }
     }
 
+    header: PageHeader {
+        id: pageHeader
+
+        property alias leadingActions: leadingBar.actions
+        property alias trailingActions: trailingBar.actions
+
+        onTrailingActionsChanged: console.log("Trailing actions lenght: " + trailingActions.length)
+
+        title: i18n.tr("Messages")
+        flickable: threadList
+        leadingActionBar {
+            id: leadingBar
+        }
+
+        trailingActionBar {
+            id: trailingBar
+        }
+    }
+
     states: [
-        PageHeadState {
+        State {
+            id: defaultState
             name: "default"
-            head: mainPage.head
-            actions: [
+            when: !searching && !selectionMode
+
+            property list<QtObject> trailingActions: [
                 Action {
                     objectName: "searchAction"
                     iconName: "search"
@@ -77,34 +96,55 @@
                     objectName: "settingsAction"
                     text: i18n.tr("Settings")
                     iconName: "settings"
-                    onTriggered: pageStack.push(Qt.resolvedUrl("SettingsPage.qml"))
+                    onTriggered: pageStack.addPageToNextColumn(mainPage, Qt.resolvedUrl("SettingsPage.qml"))
                 }
             ]
+
+            PropertyChanges {
+                target: pageHeader
+                trailingActions: defaultState.trailingActions
+                leadingActions: []
+            }
         },
-        PageHeadState {
+        State {
+            id: searchState
             name: "search"
-            head: mainPage.head
-            backAction: Action {
-                objectName: "cancelSearch"
-                visible: mainPage.searching
-                iconName: "back"
-                text: i18n.tr("Cancel")
-                onTriggered: {
-                    searchField.text = ""
-                    mainPage.searching = false
+            when: searching
+
+            property list<QtObject> leadingActions: [
+                Action {
+                    objectName: "cancelSearch"
+                    visible: mainPage.searching
+                    iconName: "back"
+                    text: i18n.tr("Cancel")
+                    onTriggered: {
+                        searchField.text = ""
+                        mainPage.searching = false
+                    }
                 }
+            ]
+
+            PropertyChanges {
+                target: pageHeader
+                contents: searchField
+                leadingActions: searchState.leadingActions
+                trailingActions: []
             }
-            contents: searchField
         },
-        PageHeadState {
-            name: "select"
-            head: mainPage.head
-            backAction: Action {
-                objectName: "selectionModeCancelAction"
-                iconName: "back"
-                onTriggered: threadList.cancelSelection()
-            }
-            actions: [
+        State {
+            id: selectionState
+            name: "selection"
+            when: selectionMode
+
+            property list<QtObject> leadingActions: [
+                Action {
+                    objectName: "selectionModeCancelAction"
+                    iconName: "back"
+                    onTriggered: threadList.cancelSelection()
+                }
+            ]
+
+            property list<QtObject> trailingActions: [
                 Action {
                     objectName: "selectionModeSelectAllAction"
                     iconName: "select"
@@ -117,6 +157,12 @@
                     onTriggered: threadList.endSelection()
                 }
             ]
+            PropertyChanges {
+                target: pageHeader
+                title: " "
+                leadingActions: selectionState.leadingActions
+                trailingActions: selectionState.trailingActions
+            }
         }
     ]
 
@@ -218,10 +264,11 @@
                     }
                     properties["participantIds"] = participantIds
                     properties["participants"] = model.participants
+                    properties["presenceRequest"] = threadDelegate.presenceItem
                     if (displayedEvent != null) {
                         properties["scrollToEventId"] = displayedEvent.eventId
                     }
-                    mainStack.push(Qt.resolvedUrl("Messages.qml"), properties)
+                    mainStack.addPageToNextColumn(mainPage, Qt.resolvedUrl("Messages.qml"), properties)
                 }
             }
             onItemPressAndHold: {

=== modified file 'src/qml/MessageBubble.qml'
--- src/qml/MessageBubble.qml	2015-10-22 15:31:05 +0000
+++ src/qml/MessageBubble.qml	2016-01-14 12:41:18 +0000
@@ -24,7 +24,7 @@
 import "dateUtils.js" as DateUtils
 import "3rd_party/ba-linkify.js" as BaLinkify
 
-Rectangle {
+BorderImage {
     id: root
 
     property int messageStatus: -1
@@ -34,10 +34,15 @@
     property var messageTimeStamp
     property int maxDelegateWidth: units.gu(27)
     property string accountName
+    // FIXME for now we just display the delivery status if it's greater than Accepted
+    property bool showDeliveryStatus: false
+    property bool deliveryStatusAvailable: showDeliveryStatus && (statusDelivered || statusRead)
 
     readonly property bool error: (messageStatus === HistoryThreadModel.MessageStatusPermanentlyFailed)
     readonly property bool sending: (messageStatus === HistoryThreadModel.MessageStatusUnknown ||
                                      messageStatus === HistoryThreadModel.MessageStatusTemporarilyFailed) && !messageIncoming
+    readonly property bool statusDelivered: (messageStatus === HistoryThreadModel.MessageStatusDelivered)
+    readonly property bool statusRead: (messageStatus === HistoryThreadModel.MessageStatusRead)
 
     // XXXX: should be hoisted
     function getCountryCode() {
@@ -69,28 +74,33 @@
         return text
     }
 
-    color: {
+    property string color: {
         if (error) {
-            return "#fc4949"
+            return "red"
         } else if (sending) {
-            return "#b2b2b2"
+            return "grey"
         } else if (messageIncoming) {
-            return "#ffffff"
+            return "white"
         } else {
-            return "#3fb24f"
+            // FIXME: use blue for IM accounts
+            return "green"
         }
     }
-    border.color: "#ACACAC"
-
-    radius: units.gu(1)
-    height: senderName.height + senderName.anchors.topMargin + textLabel.height + textTimestamp.height + units.gu(1)
+    source: "assets/" + color + "_bubble.sci"
+    smooth: true
+
+    // FIXME: maybe we should put everything inside a container to make width and height calculation easier
+    height: senderName.height + senderName.anchors.topMargin + textLabel.height + border.bottom + units.gu(0.5) + (oneLine ? 0 : messageFooter.height + messageFooter.anchors.topMargin)
+
+    // if possible, put the timestamp and the delivery status in the same line as the text
+    property int oneLineWidth: textLabel.contentWidth + messageFooter.width
+    property bool oneLine: oneLineWidth <= units.gu(27)
     width:  Math.min(units.gu(27),
-                     Math.max(textLabel.contentWidth, textTimestamp.contentWidth, senderName.contentWidth))
+                     Math.max(oneLine ? oneLineWidth : textLabel.contentWidth,
+                              messageFooter.width,
+                              senderName.contentWidth,
+                              border.right + border.left - units.gu(3)))
             + units.gu(3)
-    anchors{
-        leftMargin:  units.gu(1)
-        rightMargin: units.gu(1)
-    }
 
     Label {
         id: senderName
@@ -126,73 +136,49 @@
         color: root.messageIncoming ? UbuntuColors.darkGrey : "white"
     }
 
-    Label {
-        id: textTimestamp
-        objectName: "messageDate"
+    Row {
+        id: messageFooter
+        width: childrenRect.width
+        spacing: units.gu(1)
 
-        anchors{
+        anchors {
             top: textLabel.bottom
-            topMargin: units.gu(0.5)
-            left: parent.left
-            leftMargin: units.gu(1)
+            topMargin: oneLine ? -textTimestamp.height : units.gu(0.5)
+            right: parent.right
+            rightMargin: units.gu(1)
         }
 
-        visible: !root.sending
-        height: units.gu(2)
-        width: visible ? maxDelegateWidth : 0
-        fontSize: "xx-small"
-        color: root.messageIncoming ? UbuntuColors.lightGrey : "white"
-        opacity: root.messageIncoming ? 1.0 : 0.8
-        elide: Text.ElideRight
-        text: {
-            if (messageTimeStamp === "")
-                return ""
-
-            var str = Qt.formatTime(messageTimeStamp, Qt.DefaultLocaleShortDate)
-            if (root.accountName.length === 0 || !root.messageIncoming) {
+        Label {
+            id: textTimestamp
+            objectName: "messageDate"
+
+            anchors.bottom: parent.bottom
+            visible: !root.sending
+            height: units.gu(2)
+            width: paintedWidth > maxDelegateWidth ? maxDelegateWidth : undefined
+            fontSize: "xx-small"
+            color: root.messageIncoming ? UbuntuColors.lightGrey : "white"
+            opacity: root.messageIncoming ? 1.0 : 0.8
+            elide: Text.ElideRight
+            verticalAlignment: Text.AlignVCenter
+            text: {
+                if (messageTimeStamp === "")
+                    return ""
+
+                var str = Qt.formatTime(messageTimeStamp, Qt.DefaultLocaleShortDate)
+                if (root.accountName.length === 0 || !root.messageIncoming) {
+                    return str
+                }
+                str += " @ %1".arg(root.accountName)
                 return str
             }
-            str += " @ %1".arg(root.accountName)
-            return str
-        }
-    }
-
-    ColoredImage {
-        id: bubbleArrow
-
-        source: Qt.resolvedUrl("./assets/conversation_bubble_arrow.png")
-        color: root.color
-        asynchronous: false
-        anchors {
-            bottom: parent.bottom
-            bottomMargin: units.gu(2)
-            leftMargin: -1
-            rightMargin: -1
-        }
-        width: units.gu(1)
-        height: units.gu(1.5)
-
-        states: [
-            State {
-                when: root.messageIncoming
-                name: "incoming"
-                AnchorChanges {
-                    target: bubbleArrow
-                    anchors.right: root.left
-                }
-            },
-            State {
-                when: !root.messageIncoming
-                name: "outgoing"
-                AnchorChanges {
-                    target: bubbleArrow
-                    anchors.left: root.right
-                }
-                PropertyChanges {
-                    target: bubbleArrow
-                    mirror: true
-                }
-            }
-        ]
+        }
+
+        DeliveryStatus {
+            id: deliveryStatus
+            messageStatus: messageStatus
+            enabled: deliveryStatusAvailable
+            anchors.verticalCenter: textTimestamp.verticalCenter
+        }
     }
 }

=== modified file 'src/qml/MessageDelegate.qml'
--- src/qml/MessageDelegate.qml	2014-08-28 21:54:12 +0000
+++ src/qml/MessageDelegate.qml	2016-01-14 12:41:18 +0000
@@ -26,6 +26,7 @@
     property bool incoming: (messageData && messageData.senderId !== "self")
     property string accountLabel: ""
     property var _lastItem
+    property bool swipeLocked: false
 
     function deleteMessage()
     {

=== modified file 'src/qml/MessageDelegateFactory.qml'
--- src/qml/MessageDelegateFactory.qml	2015-09-14 13:51:27 +0000
+++ src/qml/MessageDelegateFactory.qml	2016-01-14 12:41:18 +0000
@@ -35,6 +35,8 @@
     signal resendMessage()
     signal copyMessage()
     signal showMessageDetails()
+    color: "transparent"
+    locked: loader.item.swipeLocked
 
     width: messageList.width
     leftSideAction: Action {

=== modified file 'src/qml/Messages.qml'
--- src/qml/Messages.qml	2015-12-07 17:55:17 +0000
+++ src/qml/Messages.qml	2016-01-14 12:41:18 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012, 2013, 2014 Canonical Ltd.
+ * Copyright 2012-2015 Canonical Ltd.
  *
  * This file is part of messaging-app.
  *
@@ -25,6 +25,7 @@
 import Ubuntu.History 0.1
 import Ubuntu.Telephony 0.1
 import Ubuntu.Contacts 0.1
+import messagingapp.private 0.1
 
 import "dateUtils.js" as DateUtils
 
@@ -45,8 +46,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 var activeTransfer: null
-    property int activeAttachmentIndex: -1
     property var sharedAttachmentsTransfer: []
     property alias contactWatcher: contactWatcherInternal
     property string text: ""
@@ -61,7 +60,16 @@
     property string firstParticipantId: participantIds.length > 0 ? participantIds[0] : ""
     property variant firstParticipant: participants.length > 0 ? participants[0] : null
     property var threads: []
+    property QtObject presenceRequest: presenceItem
     property var accountsModel: getAccountsModel()
+    property alias oskEnabled: keyboard.oskEnabled
+    property bool isReady: false
+    property string firstRecipientAlias: ((contactWatcher.isUnknown &&
+                                           contactWatcher.isInteractive) ||
+                                          contactWatcher.alias === "") ? contactWatcher.identifier : contactWatcher.alias
+
+    signal ready
+
     function getAccountsModel() {
         var accounts = []
         // on new chat dialogs display all possible accounts
@@ -179,123 +187,44 @@
         return (!tmpAccount || tmpAccount.type == AccountEntry.PhoneAccount || tmpAccount.type == AccountEntry.MultimediaAccount)
     }
 
-    Connections {
-        target: telepathyHelper
-        onSetupReady: {
-            // force reevaluation
-            messages.account = Qt.binding(getCurrentAccount)
-            messages.phoneAccount = Qt.binding(isPhoneAccount)
-            head.sections.model = Qt.binding(getSectionsModel)
-            head.sections.selectedIndex = Qt.binding(getSelectedIndex)
-        }
-    }
-
-
-    Connections {
-        target: chatManager
-        onChatEntryCreated: {
-            // TODO: track using chatId and not participants
-            if (accountId == account.accountId && 
-                firstParticipant && participants[0] == firstParticipant.identifier) {
-                messages.chatEntry = chatEntry
-            }
-        }
-        onChatsChanged: {
-            for (var i in chatManager.chats) {
-                var chat = chatManager.chats[i]
-                // TODO: track using chatId and not participants
-                if (chat.account.accountId == account.accountId &&
-                    firstParticipant && chat.participants[0] == firstParticipant.identifier) {
-                    messages.chatEntry = chat
-                    return
-                }
-            }
-            messages.chatEntry = null
-        }
-    }
-
-    Timer {
-        id: typingTimer
-        interval: 6000
-        onTriggered: {
-            messages.userTyping = false;
-        }
-    }
-
-    Repeater {
-        model: messages.chatEntry ? messages.chatEntry.chatStates : null
-        Item {
-            function processChatState() {
-                if (modelData.state == ChatEntry.ChannelChatStateComposing) {
-                    messages.userTyping = true
-                    typingTimer.start()
-                } else {
-                    messages.userTyping = false
-                }
-            }
-            Component.onCompleted: processChatState()
-            Connections {
-                target: modelData
-                onStateChanged: processChatState()
-            }
-        }
-    }
-
-    MessagesHeader {
-        id: header
-        width: parent ? parent.width - units.gu(2) : undefined
-        height: units.gu(5)
-        title: messages.title
-        subtitle: {
-            if (userTyping) {
-                return i18n.tr("Typing..")
-            }
-            switch (presenceRequest.type) {
-            case PresenceRequest.PresenceTypeAvailable:
-                return i18n.tr("Online")
-            case PresenceRequest.PresenceTypeOffline:
-                return i18n.tr("Offline")
-            case PresenceRequest.PresenceTypeAway:
-                return i18n.tr("Away")
-            case PresenceRequest.PresenceTypeBusy:
-                return i18n.tr("Busy")
-            default:
-                return ""
-            }
-        }
-        visible: true
-    }
-
-    head {
-        id: head
-        sections.model: getSectionsModel()
-        sections.selectedIndex: getSelectedIndex()
-    }
-
-
-    function addAttachmentsToModel(transfer) {
-        for (var i in transfer.items) {
-            if (String(transfer.items[i].text).length > 0) {
-                messages.text = String(transfer.items[i].text)
-                continue
-            }
-            var attachment = {}
-            if (!startsWith(String(transfer.items[i].url),"file://")) {
-                messages.text = String(transfer.items[i].url)
-                continue
-            }
-            var filePath = String(transfer.items[i].url).replace('file://', '')
-            // get only the basename
-            attachment["contentType"] = application.fileMimeType(filePath)
-            if (startsWith(attachment["contentType"], "text/vcard") ||
-                startsWith(attachment["contentType"], "text/x-vcard")) {
-                attachment["name"] = "contact.vcf"
-            } else {
-                attachment["name"] = filePath.split('/').reverse()[0]
-            }
-            attachment["filePath"] = filePath
-            attachments.append(attachment)
-        }
+    function addNewThreadToFilter(newAccountId, participantIds) {
+        var newAccount = telepathyHelper.accountForId(newAccountId)
+        var matchType = HistoryThreadModel.MatchCaseSensitive
+        if (newAccount.type == AccountEntry.PhoneAccount || newAccount.type == AccountEntry.MultimediaAccount) {
+            matchType = HistoryThreadModel.MatchPhoneNumber
+        }
+
+        var thread = eventModel.threadForParticipants(newAccountId,
+                                           HistoryThreadModel.EventTypeText,
+                                           participantIds,
+                                           matchType,
+                                           true)
+        var threadId = thread.threadId
+
+        // dont change the participants list
+        if (messages.participants.length == 0) {
+            messages.participants = thread.participants
+            var ids = []
+            for (var i in messages.participants) {
+                ids.push(messages.participants[i].identifier)
+            }
+            messages.participantIds = ids;
+        }
+
+        var found = false;
+        for (var i in messages.threads) {
+            if (messages.threads[i].threadId == threadId && messages.threads[i].accountId == newAccountId) {
+                found = true;
+                break;
+            }
+        }
+
+        if (!found) {
+            messages.threads.push({"accountId": newAccountId, "threadId": threadId})
+            reloadFilters = !reloadFilters
+        }
+
+        return thread
     }
 
     function sendMessageNetworkCheck() {
@@ -340,48 +269,21 @@
         }
 
         // create the new thread and update the threadId list
-        var thread = eventModel.threadForParticipants(messages.account.accountId,
-                                           HistoryThreadModel.EventTypeText,
-                                           participantIds,
-                                           messages.account.type == AccountEntry.PhoneAccount ? HistoryThreadModel.MatchPhoneNumber
-                                                                                              : HistoryThreadModel.MatchCaseSensitive,
-                                           true)
-        var threadId = thread.threadId
-
-        // dont change the participants list
-        if (messages.participants.length == 0) {
-            messages.participants = thread.participants
-            var ids = []
-            for (var i in messages.participants) {
-                ids.push(messages.participants[i].identifier)
-            }
-            messages.participantIds = ids;
-        }
-
-        var found = false;
-        for (var i in messages.threads) {
-            if (messages.threads[i].threadId == threadId && messages.threads[i].accountId == messages.account.accountId) {
-                found = true;
-                break;
-            }
-        }
-        if (!found) {
-            messages.threads.push({"accountId": messages.account.accountId, "threadId": threadId})
-            reloadFilters = !reloadFilters
-        }
+        var thread = addNewThreadToFilter(messages.account.accountId, participantIds)
+
         for (var i=0; i < eventModel.count; i++) {
             var event = eventModel.get(i)
             if (event.senderId == "self" && event.accountId != messages.account.accountId) {
                 var tmpAccount = telepathyHelper.accountForId(event.accountId)
                 if (!tmpAccount || (tmpAccount.type == AccountEntry.MultimediaAccount && messages.account.type == AccountEntry.PhoneAccount)) {
-                    // we don't add the information event if the last outgoing message 
+                    // we don't add the information event if the last outgoing message
                     // was a fallback to a multimedia service
                     break;
                 }
                 // if the last outgoing message used a different accountId, add an
                 // information event and quit the loop
                 eventModel.writeTextInformationEvent(messages.account.accountId,
-                                                     threadId,
+                                                     thread.threadId,
                                                      participantIds,
                                                      "")
                 break;
@@ -399,7 +301,7 @@
             var timestamp = new Date()
             var tmpEventId = timestamp.toISOString()
             event["accountId"] = messages.account.accountId
-            event["threadId"] = threadId
+            event["threadId"] = thread.threadId
             event["eventId"] =  tmpEventId
             event["type"] = HistoryEventModel.MessageTypeText
             event["participants"] = thread.participants
@@ -417,7 +319,7 @@
                     var attachment = {}
                     var item = attachments[i]
                     attachment["accountId"] = messages.account.accountId
-                    attachment["threadId"] = threadId
+                    attachment["threadId"] = thread.threadId
                     attachment["eventId"] = tmpEventId
                     attachment["attachmentId"] = item[0]
                     attachment["contentType"] = item[1]
@@ -436,10 +338,14 @@
             var isSelfContactKnown = account.selfContactId != ""
             if (isMmsGroupChat && !isSelfContactKnown) {
                 // TODO: inform the user to enter the phone number of the selected sim card manually
-                // and use it in the telepathy-ofono account as selfContactId. 
-                return
-            }
-            chatManager.sendMessage(messages.account.accountId, participantIds, text, attachments, properties)
+                // and use it in the telepathy-ofono account as selfContactId.
+                return false
+            }
+            var fallbackAccountId = chatManager.sendMessage(messages.account.accountId, participantIds, text, attachments, properties)
+            // create the new thread and update the threadId list
+            if (fallbackAccountId != messages.account.accountId) {
+                addNewThreadToFilter(fallbackAccountId, participantIds)
+            }
         }
 
         // FIXME: soon it won't be just about SIM cards, so the dialogs need updating
@@ -455,120 +361,6 @@
         return true
     }
 
-    PresenceRequest {
-        id: presenceRequest
-        accountId: {
-            // if this is a regular sms chat, try requesting the presence on
-            // a multimedia account
-            if (!account) {
-                return ""
-            }
-            if (account.type == AccountEntry.PhoneAccount) {
-                for (var i in telepathyHelper.accounts) {
-                    var tmpAccount = telepathyHelper.accounts[i]
-                    if (tmpAccount.type == AccountEntry.MultimediaAccount) {
-                        return tmpAccount.accountId
-                    }
-                }
-                return ""
-            }
-            return account.accountId
-        }
-        // we just request presence on 1-1 chats
-        identifier: participants.length == 1 ? participants[0].identifier : ""
-    }
-
-    // this is necessary to automatically update the view when the
-    // default account changes in system settings
-    Connections {
-        target: mainView
-        onAccountChanged: {
-            if (!messages.phoneAccount) {
-                return
-            }
-            messages.account = mainView.account
-        }
-    }
-
-    ActivityIndicator {
-        id: activityIndicator
-        anchors {
-            verticalCenter: parent.verticalCenter
-            horizontalCenter: parent.horizontalCenter
-        }
-        running: isSearching
-        visible: running
-    }
-
-    ListModel {
-        id: attachments
-    }
-
-    PictureImport {
-        id: pictureImporter
-
-        onPictureReceived: {
-            var attachment = {}
-            var filePath = String(pictureUrl).replace('file://', '')
-            attachment["contentType"] = application.fileMimeType(filePath)
-            attachment["name"] = filePath.split('/').reverse()[0]
-            attachment["filePath"] = filePath
-            attachments.append(attachment)
-            textEntry.forceActiveFocus()
-        }
-    }
-
-    flickable: null
-
-    property bool isReady: false
-    signal ready
-    onReady: {
-        isReady = true
-        if (participants.length === 0 && keyboardFocus)
-            multiRecipient.forceFocus()
-    }
-
-    property string firstRecipientAlias: ((contactWatcher.isUnknown &&
-                                           contactWatcher.isInteractive) ||
-                                          contactWatcher.alias === "") ? contactWatcher.identifier : contactWatcher.alias
-    title: {
-        if (selectionMode || participants.length == 0) {
-            return " "
-        }
-
-        if (landscape) {
-            return ""
-        }
-        if (participants.length > 0) {
-            if (participants.length == 1) {
-                return firstRecipientAlias
-            } else {
-                // TRANSLATORS: %1 refers to the number of participants in a group chat
-                return i18n.tr("Group (%1)").arg(participants.length)
-            }
-        }
-        return i18n.tr("New Message")
-    }
-
-    Component.onCompleted: {
-        if (messages.accountId !== "") {
-            var account = telepathyHelper.accountForId(messages.accountId)
-            if (account && account.type == AccountEntry.MultimediaAccount) {
-                // fallback the first available phone account 
-                if (telepathyHelper.phoneAccounts.length > 0) {
-                    messages.accountId = telepathyHelper.phoneAccounts[0].accountId
-                }
-            }
-        }
-        addAttachmentsToModel(sharedAttachmentsTransfer)
-    }
-
-    onActiveChanged: {
-        if (active && (eventModel.count > 0)){
-            swipeItemDemo.enable()
-        }
-    }
-
     function updateFilters(accounts, participants, reload, threads) {
         if (participants.length == 0 || accounts.length == 0) {
             return null
@@ -584,7 +376,7 @@
             }
             return Qt.createQmlObject(componentUnion.arg(componentFilters), eventModel)
         }
- 
+
         var filterAccounts = []
 
         if (messages.accountsModel.length == 1 && messages.accountsModel[0].type == AccountEntry.GenericAccount) {
@@ -596,9 +388,9 @@
                     filterAccounts.push(account)
                 }
             }
-       }
+        }
 
-       for (var i in filterAccounts) {
+        for (var i in filterAccounts) {
             var account = filterAccounts[i];
             var filterValue = eventModel.threadIdForParticipants(account.accountId,
                                                                  HistoryThreadModel.EventTypeText,
@@ -628,8 +420,283 @@
         return eventModel.markEventAsRead(accountId, threadId, eventId, type);
     }
 
+    header: PageHeader {
+        id: pageHeader
+
+        property alias leadingActions: leadingBar.actions
+        property alias trailingActions: trailingBar.actions
+
+        title: {
+            if (landscape) {
+                return ""
+            }
+
+            if (participants.length == 1) {
+                return firstRecipientAlias
+            }
+
+            return i18n.tr("New Message")
+        }
+
+        Sections {
+            id: sections
+            anchors {
+                left: parent.left
+                leftMargin: units.gu(2)
+                bottom: parent.bottom
+            }
+            model: getSectionsModel()
+            selectedIndex: getSelectedIndex()
+        }
+
+        extension: sections.model.length > 1 ? sections : null
+
+        leadingActionBar {
+            id: leadingBar
+        }
+
+        trailingActionBar {
+            id: trailingBar
+        }
+    }
+
+    states: [
+        State {
+            id: selectionState
+            name: "selection"
+            when: selectionMode
+
+            property list<QtObject> leadingActions: [
+                Action {
+                    objectName: "selectionModeCancelAction"
+                    iconName: "back"
+                    onTriggered: messageList.cancelSelection()
+                }
+            ]
+
+            property list<QtObject> trailingActions: [
+                Action {
+                    objectName: "selectionModeSelectAllAction"
+                    iconName: "select"
+                    onTriggered: {
+                        if (messageList.selectedItems.count === messageList.count) {
+                            messageList.clearSelection()
+                        } else {
+                            messageList.selectAll()
+                        }
+                    }
+                },
+                Action {
+                    objectName: "selectionModeDeleteAction"
+                    enabled: messageList.selectedItems.count > 0
+                    iconName: "delete"
+                    onTriggered: messageList.endSelection()
+                }
+            ]
+
+            PropertyChanges {
+                target: pageHeader
+                title: " "
+                leadingActions: selectionState.leadingActions
+                trailingActions: selectionState.trailingActions
+            }
+        },
+        State {
+            id: groupChatState
+            name: "groupChat"
+            when: groupChat
+
+            property list<QtObject> trailingActions: [
+                Action {
+                    objectName: "groupChatAction"
+                    iconName: "contact-group"
+                    onTriggered: PopupUtils.open(participantsPopover, screenTop)
+                }
+            ]
+
+            PropertyChanges {
+                target: pageHeader
+                // TRANSLATORS: %1 refers to the number of participants in a group chat
+                title: i18n.tr("Group (%1)").arg(participants.length)
+                contents: headerContents
+                trailingActions: groupChatState.trailingActions
+            }
+        },
+        State {
+            id: unknownContactState
+            name: "unknownContact"
+            when: participants.length == 1 && contactWatcher.isUnknown
+
+            property list<QtObject> trailingActions: [
+                Action {
+                    objectName: "contactCallAction"
+                    visible: participants.length == 1 && contactWatcher.interactive
+                    iconName: "call-start"
+                    text: i18n.tr("Call")
+                    onTriggered: {
+                        Qt.inputMethod.hide()
+                        // FIXME: support other things than just phone numbers
+                        Qt.openUrlExternally("tel:///" + encodeURIComponent(contactWatcher.identifier))
+                    }
+                },
+                Action {
+                    objectName: "addContactAction"
+                    visible: contactWatcher.isUnknown && participants.length == 1 && contactWatcher.interactive
+                    iconName: "contact-new"
+                    text: i18n.tr("Add")
+                    onTriggered: {
+                        Qt.inputMethod.hide()
+                        // FIXME: support other things than just phone numbers
+                        mainView.addPhoneToContact(messages, "", contactWatcher.identifier, null, null)
+                    }
+                }
+            ]
+            PropertyChanges {
+                target: pageHeader
+                contents: headerContents
+                trailingActions: unknownContactState.trailingActions
+            }
+        },
+        State {
+            id: newMessageState
+            name: "newMessage"
+            when: participants.length === 0
+            property list<QtObject> trailingActions: [
+                Action {
+                    objectName: "contactList"
+                    iconName: "contact"
+                    onTriggered: {
+                        Qt.inputMethod.hide()
+                        mainStack.addPageToCurrentColumn(messages, Qt.resolvedUrl("NewRecipientPage.qml"), {"multiRecipient": multiRecipient, "parentPage": messages})
+                    }
+                }
+
+            ]
+
+            property Item contents: MultiRecipientInput {
+                id: multiRecipient
+                objectName: "multiRecipient"
+                enabled: visible
+                anchors {
+                    left: parent ? parent.left : undefined
+                    right: parent ? parent.right : undefined
+                    rightMargin: units.gu(2)
+                    top: parent ? parent.top: undefined
+                    topMargin: units.gu(1)
+                }
+            }
+
+            PropertyChanges {
+                target: pageHeader
+                title: " "
+                trailingActions: newMessageState.trailingActions
+                contents: newMessageState.contents
+            }
+        },
+        State {
+            id: knownContactState
+            name: "knownContact"
+            when: participants.length == 1 && !contactWatcher.isUnknown
+            property list<QtObject> trailingActions: [
+                Action {
+                    objectName: "contactCallKnownAction"
+                    visible: participants.length == 1 && messages.phoneAccount
+                    iconName: "call-start"
+                    text: i18n.tr("Call")
+                    onTriggered: {
+                        Qt.inputMethod.hide()
+                        // FIXME: support other things than just phone numbers
+                        Qt.openUrlExternally("tel:///" + encodeURIComponent(contactWatcher.identifier))
+                    }
+                },
+                Action {
+                    objectName: "contactProfileAction"
+                    visible: !contactWatcher.isUnknown && participants.length == 1 && messages.phoneAccount
+                    iconSource: "image://theme/contact"
+                    text: i18n.tr("Contact")
+                    onTriggered: {
+                        mainView.showContactDetails(messages, contactWatcher.contactId, null, null)
+                    }
+                }
+            ]
+            PropertyChanges {
+                target: pageHeader
+                contents: headerContents
+                trailingActions: knownContactState.trailingActions
+            }
+        }
+    ]
+
+    Component.onCompleted: {
+        if (messages.accountId !== "") {
+            var account = telepathyHelper.accountForId(messages.accountId)
+            if (account && account.type == AccountEntry.MultimediaAccount) {
+                // fallback the first available phone account
+                if (telepathyHelper.phoneAccounts.length > 0) {
+                    messages.accountId = telepathyHelper.phoneAccounts[0].accountId
+                }
+            }
+        }
+        composeBar.addAttachments(sharedAttachmentsTransfer)
+    }
+
+    onReady: {
+        isReady = true
+        if (participants.length === 0 && keyboardFocus)
+            multiRecipient.forceFocus()
+    }
+
+    onActiveChanged: {
+        if (active && (eventModel.count > 0)){
+            swipeItemDemo.enable()
+        }
+    }
+
+    Connections {
+        target: telepathyHelper
+        onSetupReady: {
+            // force reevaluation
+            messages.account = Qt.binding(getCurrentAccount)
+            messages.phoneAccount = Qt.binding(isPhoneAccount)
+            head.sections.model = Qt.binding(getSectionsModel)
+            head.sections.selectedIndex = Qt.binding(getSelectedIndex)
+        }
+    }
+
+    Connections {
+        target: chatManager
+        onChatEntryCreated: {
+            // TODO: track using chatId and not participants
+            if (accountId == account.accountId &&
+                firstParticipant && participants[0] == firstParticipant.identifier) {
+                messages.chatEntry = chatEntry
+            }
+        }
+        onChatsChanged: {
+            for (var i in chatManager.chats) {
+                var chat = chatManager.chats[i]
+                // TODO: track using chatId and not participants
+                if (chat.account.accountId == account.accountId &&
+                    firstParticipant && chat.participants[0] == firstParticipant.identifier) {
+                    messages.chatEntry = chat
+                    return
+                }
+            }
+            messages.chatEntry = null
+        }
+    }
+
+    // this is necessary to automatically update the view when the
+    // default account changes in system settings
     Connections {
         target: mainView
+        onAccountChanged: {
+            if (!messages.phoneAccount) {
+                return
+            }
+            messages.account = mainView.account
+        }
+
         onApplicationActiveChanged: {
             if (mainView.applicationActive) {
                 for (var i in pendingEventsToMarkAsRead) {
@@ -641,28 +708,96 @@
         }
     }
 
-    Component {
-        id: attachmentPopover
-
-        Popover {
-            id: popover
-            Column {
-                id: containerLayout
-                anchors {
-                    left: parent.left
-                    top: parent.top
-                    right: parent.right
+    Connections {
+        target: messages.head.sections
+        onSelectedIndexChanged: {
+            messages.account = messages.accountsModel[head.sections.selectedIndex]
+        }
+    }
+
+    Timer {
+        id: typingTimer
+        interval: 6000
+        onTriggered: {
+            messages.userTyping = false;
+        }
+    }
+
+    Repeater {
+        model: messages.chatEntry ? messages.chatEntry.chatStates : null
+        Item {
+            function processChatState() {
+                if (modelData.state == ChatEntry.ChannelChatStateComposing) {
+                    messages.userTyping = true
+                    typingTimer.start()
+                } else {
+                    messages.userTyping = false
                 }
-                ListItem.Standard {
-                    text: i18n.tr("Remove")
-                    onClicked: {
-                        attachments.remove(activeAttachmentIndex)
-                        PopupUtils.close(popover)
+            }
+            Component.onCompleted: processChatState()
+            Connections {
+                target: modelData
+                onStateChanged: processChatState()
+            }
+        }
+    }
+
+    MessagesHeader {
+        id: headerContents
+        width: parent ? parent.width - units.gu(2) : undefined
+        height: units.gu(5)
+        title: pageHeader.title
+        subtitle: {
+            if (userTyping) {
+                return i18n.tr("Typing..")
+            }
+            switch (presenceRequest.type) {
+            case PresenceRequest.PresenceTypeAvailable:
+                return i18n.tr("Online")
+            case PresenceRequest.PresenceTypeOffline:
+                return i18n.tr("Offline")
+            case PresenceRequest.PresenceTypeAway:
+                return i18n.tr("Away")
+            case PresenceRequest.PresenceTypeBusy:
+                return i18n.tr("Busy")
+            default:
+                return ""
+            }
+        }
+        visible: true
+    }
+
+    PresenceRequest {
+        id: presenceItem
+        accountId: {
+            // if this is a regular sms chat, try requesting the presence on
+            // a multimedia account
+            if (!account) {
+                return ""
+            }
+            if (account.type == AccountEntry.PhoneAccount) {
+                for (var i in telepathyHelper.accounts) {
+                    var tmpAccount = telepathyHelper.accounts[i]
+                    if (tmpAccount.type == AccountEntry.MultimediaAccount) {
+                        return tmpAccount.accountId
                     }
                 }
+                return ""
             }
-            Component.onDestruction: activeAttachmentIndex = -1
-        }
+            return account.accountId
+        }
+        // we just request presence on 1-1 chats
+        identifier: participants.length == 1 ? participants[0].identifier : ""
+    }
+
+    ActivityIndicator {
+        id: activityIndicator
+        anchors {
+            verticalCenter: parent.verticalCenter
+            horizontalCenter: parent.horizontalCenter
+        }
+        running: isSearching
+        visible: running
     }
 
     Component {
@@ -727,13 +862,6 @@
         }
     }
 
-    Connections {
-        target: messages.head.sections
-        onSelectedIndexChanged: {
-            messages.account = messages.accountsModel[head.sections.selectedIndex]
-        }
-    }
-
     Loader {
         id: searchListLoader
 
@@ -748,7 +876,7 @@
             topMargin: units.gu(2)
             left: parent.left
             right: parent.right
-            bottom: bottomPanel.top
+            bottom: composeBar.top
         }
         z: 1
         Behavior on height {
@@ -805,160 +933,6 @@
         addressableFields: messages.account ? messages.account.addressableVCardFields : ["tel"] // just to have a fallback there
     }
 
-    onAccountsModelChanged: {
-        reloadFilters = !reloadFilters
-    }
-
-    Action {
-        id: backButton
-        objectName: "backButton"
-        iconName: "back"
-        onTriggered: {
-            if (typeof mainPage !== 'undefined') {
-                mainPage.temporaryProperties = null
-            }
-            mainStack.pop()
-        }
-    }
-
-    states: [
-        PageHeadState {
-            name: "selection"
-            head: messages.head
-            when: selectionMode
-
-            backAction: Action {
-                objectName: "selectionModeCancelAction"
-                iconName: "back"
-                onTriggered: messageList.cancelSelection()
-            }
-
-            actions: [
-                Action {
-                    objectName: "selectionModeSelectAllAction"
-                    iconName: "select"
-                    onTriggered: {
-                        if (messageList.selectedItems.count === messageList.count) {
-                            messageList.clearSelection()
-                        } else {
-                            messageList.selectAll()
-                        }
-                    }
-                },
-                Action {
-                    objectName: "selectionModeDeleteAction"
-                    enabled: messageList.selectedItems.count > 0
-                    iconName: "delete"
-                    onTriggered: messageList.endSelection()
-                }
-            ]
-        },
-        PageHeadState {
-            name: "groupChat"
-            head: messages.head
-            when: groupChat
-            contents: header
-            backAction: backButton
-
-            actions: [
-                Action {
-                    objectName: "groupChatAction"
-                    iconName: "contact-group"
-                    onTriggered: PopupUtils.open(participantsPopover, screenTop)
-                }
-            ]
-        },
-        PageHeadState {
-            name: "unknownContact"
-            head: messages.head
-            when: participants.length == 1 && contactWatcher.isUnknown
-            backAction: backButton
-            contents: header
-
-            actions: [
-                Action {
-                    objectName: "contactCallAction"
-                    visible: participants.length == 1 && contactWatcher.interactive
-                    iconName: "call-start"
-                    text: i18n.tr("Call")
-                    onTriggered: {
-                        Qt.inputMethod.hide()
-                        // FIXME: support other things than just phone numbers
-                        Qt.openUrlExternally("tel:///" + encodeURIComponent(contactWatcher.identifier))
-                    }
-                },
-                Action {
-                    objectName: "addContactAction"
-                    visible: contactWatcher.isUnknown && participants.length == 1 && contactWatcher.interactive
-                    iconName: "contact-new"
-                    text: i18n.tr("Add")
-                    onTriggered: {
-                        Qt.inputMethod.hide()
-                        // FIXME: support other things than just phone numbers
-                        mainView.addPhoneToContact("", contactWatcher.identifier, null, null)
-                    }
-                }
-            ]
-        },
-        PageHeadState {
-            name: "newMessage"
-            head: messages.head
-            when: participants.length === 0 && isReady
-            backAction: backButton
-            actions: [
-                Action {
-                    objectName: "contactList"
-                    iconName: "contact"
-                    onTriggered: {
-                        Qt.inputMethod.hide()
-                        mainStack.push(Qt.resolvedUrl("NewRecipientPage.qml"), {"multiRecipient": multiRecipient, "parentPage": messages})
-                    }
-                }
-
-            ]
-
-            contents: MultiRecipientInput {
-                id: multiRecipient
-                objectName: "multiRecipient"
-                enabled: visible
-                anchors {
-                    left: parent ? parent.left : undefined
-                    right: parent ? parent.right : undefined
-                    rightMargin: units.gu(2)
-                }
-            }
-        },
-        PageHeadState {
-            name: "knownContact"
-            head: messages.head
-            when: participants.length == 1 && !contactWatcher.isUnknown
-            backAction: backButton
-            contents: header
-            actions: [
-                Action {
-                    objectName: "contactCallKnownAction"
-                    visible: participants.length == 1 && messages.phoneAccount
-                    iconName: "call-start"
-                    text: i18n.tr("Call")
-                    onTriggered: {
-                        Qt.inputMethod.hide()
-                        // FIXME: support other things than just phone numbers
-                        Qt.openUrlExternally("tel:///" + encodeURIComponent(contactWatcher.identifier))
-                    }
-                },
-                Action {
-                    objectName: "contactProfileAction"
-                    visible: !contactWatcher.isUnknown && participants.length == 1 && messages.phoneAccount
-                    iconSource: "image://theme/contact"
-                    text: i18n.tr("Contact")
-                    onTriggered: {
-                        mainView.showContactDetails(contactWatcher.contactId, null, null)
-                    }
-                }
-            ]
-        }
-    ]
-
     HistoryEventModel {
         id: eventModel
         type: HistoryThreadModel.EventTypeText
@@ -1023,392 +997,125 @@
         objectName: "messageList"
         visible: !isSearching
 
+        Rectangle {
+            color: Theme.palette.normal.background
+            anchors.fill: parent
+            Image {
+                width: units.gu(20)
+                fillMode: Image.PreserveAspectFit
+                anchors.centerIn: parent
+                visible: source !== ""
+                source: {
+                    var accountId = ""
+
+                    if (messages.account) {
+                        accountId = messages.account.accountId
+                    }
+
+                    if (presenceRequest.type != PresenceRequest.PresenceTypeUnknown
+                            && presenceRequest.type != PresenceRequest.PresenceTypeUnset) {
+                        accountId = presenceRequest.accountId
+                    }
+
+                    return telepathyHelper.accountForId(accountId).protocolInfo.backgroundImage
+                }
+                z: 1
+            }
+            z: -1
+        }
+
         // because of the header
         clip: true
         anchors {
             top: screenTop.bottom
             left: parent.left
             right: parent.right
-            bottom: bottomPanel.top
+            bottom: composeBar.top
         }
     }
 
-    Item {
-        id: bottomPanel
-        property int defaultHeight: textEntry.height + units.gu(2)
-        anchors.bottom: isSearching ? parent.bottom : keyboard.top
-        anchors.left: parent.left
-        anchors.right: parent.right
-        height: {
-            if (selectionMode || (participants.length > 0 && !contactWatcher.interactive)) {
-                return 0
-            } else {
-                if (messages.height - keyboard.height - screenTop.y > defaultHeight) {
-                    return defaultHeight
-                } else {
-                    return messages.height - keyboard.height - screenTop.y
-                }
-            }
-        }
-        visible: !selectionMode && !isSearching
-        clip: true
-        MouseArea {
-            anchors.fill: parent
-            onClicked: {
-                messageTextArea.forceActiveFocus()
-            }
-        }
-
-        Behavior on height {
-            UbuntuNumberAnimation { }
-        }
-
-        ListItem.ThinDivider {
-            anchors.top: parent.top
-        }
-
-        Icon {
-            id: attachButton
-            objectName: "attachButton"
-            anchors.left: parent.left
-            anchors.leftMargin: units.gu(2)
-            anchors.verticalCenter: sendButton.verticalCenter
-            height: units.gu(3)
-            width: units.gu(3)
-            color: "gray"
-            name: "camera-app-symbolic"
-            MouseArea {
-                anchors.fill: parent
-                anchors.margins: units.gu(-2)
-                onClicked: {
-                    Qt.inputMethod.hide()
-                    pictureImporter.requestNewPicture()
-                }
-            }
-        }
-
-        StyledItem {
-            id: textEntry
-            property alias text: messageTextArea.text
-            property alias inputMethodComposing: messageTextArea.inputMethodComposing
-            property int fullSize: attachmentThumbnails.height + messageTextArea.height
-            style: Theme.createStyleComponent("TextAreaStyle.qml", textEntry)
-            anchors.bottomMargin: units.gu(1)
-            anchors.bottom: parent.bottom
-            anchors.left: attachButton.right
-            anchors.leftMargin: units.gu(1)
-            anchors.right: sendButton.left
-            anchors.rightMargin: units.gu(1)
-            height: attachments.count !== 0 ? fullSize + units.gu(1.5) : fullSize
-            onActiveFocusChanged: {
-                if(activeFocus) {
-                    messageTextArea.forceActiveFocus()
-                } else {
-                    focus = false
-                }
-            }
-            focus: false
-            MouseArea {
-                anchors.fill: parent
-                onClicked: messageTextArea.forceActiveFocus()
-            }
-            Flow {
-                id: attachmentThumbnails
-                spacing: units.gu(1)
-                anchors{
-                    left: parent.left
-                    right: parent.right
-                    top: parent.top
-                    topMargin: units.gu(1)
-                    leftMargin: units.gu(1)
-                    rightMargin: units.gu(1)
-                }
-                height: childrenRect.height
-
-                Component {
-                    id: thumbnailImage
-                    UbuntuShape {
-                        property int index
-                        property string filePath
-
-                        width: childrenRect.width
-                        height: childrenRect.height
-
-                        image: Image {
-                            id: avatarImage
-                            width: units.gu(8)
-                            height: units.gu(8)
-                            sourceSize.height: height
-                            sourceSize.width: width
-                            fillMode: Image.PreserveAspectCrop
-                            source: filePath
-                            asynchronous: true
-                        }
-                        MouseArea {
-                            anchors.fill: parent
-                            onPressAndHold: {
-                                mouse.accept = true
-                                Qt.inputMethod.hide()
-                                activeAttachmentIndex = index
-                                PopupUtils.open(attachmentPopover, parent)
-                            }
-                        }
-                    }
-                }
-
-                Component {
-                    id: thumbnailContact
-                    Item {
-                        id: attachment
-
-                        readonly property int contactsCount:vcardParser.contacts ? vcardParser.contacts.length : 0
-                        property int index
-                        property string filePath
-                        property alias vcard: vcardParser
-                        property string contactDisplayName: {
-                            if (contactsCount > 0)  {
-                                var contact = vcard.contacts[0]
-                                if (contact.displayLabel.label && (contact.displayLabel.label != "")) {
-                                    return contact.displayLabel.label
-                                } else if (contact.name) {
-                                    var contacFullName  = contact.name.firstName
-                                    if (contact.name.midleName) {
-                                        contacFullName += " " + contact.name.midleName
-                                    }
-                                    if (contact.name.lastName) {
-                                        contacFullName += " " + contact.name.lastName
-                                    }
-                                    return contacFullName
-                                }
-                                return i18n.tr("Unknown contact")
-                            }
-                            return ""
-                        }
-                        property string title: {
-                            var result = attachment.contactDisplayName
-                            if (attachment.contactsCount > 1) {
-                                return result + " (+%1)".arg(attachment.contactsCount-1)
-                            } else {
-                                return result
-                            }
-                        }
-
-                        height: units.gu(6)
-                        width: textEntry.width
-
-                        ContactAvatar {
-                            id: avatar
-
-                            anchors {
-                                top: parent.top
-                                bottom: parent.bottom
-                                left: parent.left
-                            }
-                            contactElement: attachment.contactsCount === 1 ? attachment.vcard.contacts[0] : null
-                            fallbackAvatarUrl: attachment.contactsCount === 1 ? "image://theme/contact" : "image://theme/contact-group"
-                            fallbackDisplayName: attachment.contactsCount === 1 ? attachment.contactDisplayName : ""
-                            width: height
-                        }
-                        Label {
-                            id: label
-
-                            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: attachment.title
-                            elide: Text.ElideMiddle
-                            color: UbuntuColors.lightAubergine
-                        }
-                        MouseArea {
-                            anchors.fill: parent
-                            onPressAndHold: {
-                                mouse.accept = true
-                                Qt.inputMethod.hide()
-                                activeAttachmentIndex = index
-                                PopupUtils.open(attachmentPopover, parent)
-                            }
-                        }
-                        VCardParser {
-                            id: vcardParser
-
-                            vCardUrl: attachment ? Qt.resolvedUrl(attachment.filePath) : ""
-                        }
-                    }
-                }
-
-                Component {
-                    id: thumbnailUnknown
-
-                    UbuntuShape {
-                        property int index
-                        property string filePath
-
-                        width: units.gu(8)
-                        height: units.gu(8)
-
-                        Icon {
-                            anchors.centerIn: parent
-                            width: units.gu(6)
-                            height: units.gu(6)
-                            name: "attachment"
-                        }
-                        MouseArea {
-                            anchors.fill: parent
-                            onPressAndHold: {
-                                mouse.accept = true
-                                Qt.inputMethod.hide()
-                                activeAttachmentIndex = index
-                                PopupUtils.open(attachmentPopover, parent)
-                            }
-                        }
-                    }
-                }
-
-                Repeater {
-                    model: attachments
-                    delegate: Loader {
-                        height: units.gu(8)
-                        sourceComponent: {
-                            var contentType = getContentType(filePath)
-                            console.log(contentType)
-                            switch(contentType) {
-                            case ContentType.Contacts:
-                                return thumbnailContact
-                            case ContentType.Pictures:
-                                return thumbnailImage
-                            case ContentType.Unknown:
-                                return thumbnailUnknown
-                            default:
-                                console.log("unknown content Type")
-                            }
-                        }
-                        onStatusChanged: {
-                            if (status == Loader.Ready) {
-                                item.index = index
-                                item.filePath = filePath
-                            }
-                        }
-                    }
-                }
-            }
-
-            ListItem.ThinDivider {
-                id: divider
-
-                anchors {
-                    left: parent.left
-                    right: parent.right
-                    top: attachmentThumbnails.bottom
-                    margins: units.gu(0.5)
-                }
-                visible: attachments.count > 0
-            }
-
-            TextArea {
-                id: messageTextArea
-                objectName: "messageTextArea"
-                anchors {
-                    top: attachments.count == 0 ? textEntry.top : attachmentThumbnails.bottom
-                    left: parent.left
-                    right: parent.right
-                }
-                // this value is to avoid letter being cut off
-                height: units.gu(4.3)
-                style: LocalTextAreaStyle {}
-                autoSize: true
-                maximumLineCount: attachments.count == 0 ? 8 : 4
-                placeholderText: i18n.tr("Write a message...")
-                focus: textEntry.focus
-                font.family: "Ubuntu"
-                font.pixelSize: FontUtils.sizeToPixels("medium")
-                color: "#5d5d5d"
-                text: messages.text
-            }
-
-            /*InverseMouseArea {
-                anchors.fill: parent
-                visible: textEntry.activeFocus
-                onClicked: {
-                    textEntry.focus = false;
-                }
-            }*/
-            Component.onCompleted: {
-                // if page is active, it means this is not a bottom edge page
-                if (messages.active && messages.keyboardFocus && participants.length != 0) {
-                    messageTextArea.forceActiveFocus()
-                }
-            }
-        }
-
-        Icon {
-            id: sendButton
-            objectName: "sendButton"
-            anchors.verticalCenter: textEntry.verticalCenter
-            anchors.right: parent.right
-            anchors.rightMargin: units.gu(2)
-            color: "gray"
-            source: Qt.resolvedUrl("./assets/send.svg")
-            width: units.gu(3)
-            height: units.gu(3)
-            enabled: {
-               if (participants.length > 0 || multiRecipient.recipientCount > 0 || multiRecipient.searchString !== "") {
-                    if (textEntry.text != "" || textEntry.inputMethodComposing || attachments.count > 0) {
-                        return true
-                    }
-                }
-                return false
-            }
-
-            MouseArea {
-                anchors.fill: parent
-                anchors.margins: units.gu(-2)
-                onClicked: {
-                    // make sure we flush everything we have prepared in the OSK preedit
-                    Qt.inputMethod.commit();
-                    if (textEntry.text == "" && attachments.count == 0) {
-                        return
-                    }
-                    // refresh the recipient list
-                    multiRecipient.focus = false
-
-                    if (messages.account && messages.accountId == "") {
-                        messages.accountId = messages.account.accountId
-                        messages.head.sections.selectedIndex = Qt.binding(getSelectedIndex)
-                    }
-
-                    var newAttachments = []
-                    for (var i = 0; i < attachments.count; i++) {
-                        var attachment = []
-                        var item = attachments.get(i)
-                        // we dont include smil files. they will be auto generated
-                        if (item.contentType.toLowerCase() === "application/smil") {
-                            continue
-                        }
-                        attachment.push(item.name)
-                        attachment.push(item.contentType)
-                        attachment.push(item.filePath)
-                        newAttachments.push(attachment)
-                    }
-
-                    var recipients = participantIds.length > 0 ? participantIds :
-                                                                 multiRecipient.recipients
-                    // if sendMessage succeeds it means the message was either sent or
-                    // injected into the history service so the user can retry later
-                    if (sendMessage(textEntry.text, recipients, newAttachments)) {
-                        textEntry.text = ""
-                        attachments.clear()
-                    }
-                    if (eventModel.filter == null) {
-                        reloadFilters = !reloadFilters
-                    }
-                }
+    ComposeBar {
+        id: composeBar
+        anchors {
+            bottom: isSearching ? parent.bottom : keyboard.top
+            left: parent.left
+            right: parent.right
+        }
+
+        showContents: !selectionMode && !isSearching
+        maxHeight: messages.height - keyboard.height - screenTop.y
+        text: messages.text
+        canSend: participants.length > 0 || multiRecipient.recipientCount > 0 || multiRecipient.searchString !== ""
+        oskEnabled: messages.oskEnabled
+
+        Component.onCompleted: {
+            // if page is active, it means this is not a bottom edge page
+            if (messages.active && messages.keyboardFocus && participants.length != 0) {
+                forceFocus()
+            }
+        }
+
+        onSendRequested: {
+            // refresh the recipient list
+            multiRecipient.focus = false
+
+            if (messages.account && messages.accountId == "") {
+                messages.accountId = messages.account.accountId
+                messages.head.sections.selectedIndex = Qt.binding(getSelectedIndex)
+            }
+
+            var newAttachments = []
+            var videoSize = 0;
+            for (var i = 0; i < attachments.count; i++) {
+                var attachment = []
+                var item = attachments.get(i)
+                // we dont include smil files. they will be auto generated
+                if (item.contentType.toLowerCase() === "application/smil") {
+                    continue
+                }
+                if (startsWith(item.contentType.toLowerCase(),"video/")) {
+                    videoSize += FileOperations.size(item.filePath)
+                }
+                attachment.push(item.name)
+                attachment.push(item.contentType)
+                attachment.push(item.filePath)
+                newAttachments.push(attachment)
+            }
+            if (videoSize > 307200 && !settings.messagesDontShowFileSizeWarning) {
+                // FIXME we are guessing here if the handler will try to send it over multimedia account
+                var isPhone = (account && account.type == AccountEntry.PhoneAccount)
+                if (isPhone) {
+                    for (var i in telepathyHelper.accounts) {
+                        var tmpAccount = telepathyHelper.accounts[i]
+                        if (tmpAccount.type == AccountEntry.MultimediaAccount) {
+                            // now check if the user is at least known by the account
+                            if (presenceRequest.type != PresenceRequest.PresenceTypeUnknown
+                                     && presenceRequest.type != PresenceRequest.PresenceTypeUnset) {
+                                isPhone = false
+                            }
+                        }
+                    }
+                }
+ 
+                if (isPhone) {
+                    PopupUtils.open(Qt.createComponent("Dialogs/FileSizeWarningDialog.qml").createObject(messages))
+                }
+            }
+
+            var recipients = participantIds.length > 0 ? participantIds :
+                                                         multiRecipient.recipients
+            var properties = {}
+            if (composeBar.audioAttached) {
+                properties["x-canonical-tmp-files"] = true
+            }
+
+            // if sendMessage succeeds it means the message was either sent or
+            // injected into the history service so the user can retry later
+            if (sendMessage(text, recipients, newAttachments, properties)) {
+                composeBar.reset()
+            }
+            if (eventModel.filter == null) {
+                reloadFilters = !reloadFilters
             }
         }
     }

=== modified file 'src/qml/MessagesHeader.qml'
--- src/qml/MessagesHeader.qml	2015-08-04 01:06:06 +0000
+++ src/qml/MessagesHeader.qml	2016-01-14 12:41:18 +0000
@@ -18,7 +18,7 @@
 
 
 import QtQuick 2.2
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 
 Item {
     id: header
@@ -26,7 +26,12 @@
     property string title: ""
     property string subtitle: ""
 
-    height: units.gu(7)
+    height: units.gu(8)
+
+    anchors {
+        top: parent.top
+        topMargin: units.gu(1)
+    }
 
     Behavior on height {
         UbuntuNumberAnimation {}
@@ -50,7 +55,7 @@
             }
             verticalAlignment: Text.AlignVCenter
 
-            font.pixelSize: FontUtils.sizeToPixels("x-large")
+            font.pixelSize: FontUtils.sizeToPixels("large")
             elide: Text.ElideRight
             text: title
         }

=== modified file 'src/qml/MessagingContactEditorPage.qml'
--- src/qml/MessagingContactEditorPage.qml	2016-01-06 18:29:47 +0000
+++ src/qml/MessagingContactEditorPage.qml	2016-01-14 12:41:18 +0000
@@ -28,6 +28,7 @@
 
     property var contactListPage: null
 
+<<<<<<< TREE
     leadingActions: Action {
         objectName: "cancel"
 
@@ -36,9 +37,41 @@
         onTriggered: {
             root.cancel()
             root.active = false
+=======
+    header: PageHeader {
+        id: pageHeader
+
+        leadingActionBar {
+            actions: [
+                Action {
+                    objectName: "cancel"
+
+                    text: i18n.tr("Cancel")
+                    iconName: "back"
+                    onTriggered: {
+                        root.cancel()
+                        root.active = false
+                    }
+                }
+            ]