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.

[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)

[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)

[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)

[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)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:456
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/893/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6022/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/402/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6033/console

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

review: Needs Fixing (continuous-integration)

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

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.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:457
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/894/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6049/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/403/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6060/console

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

review: Needs Fixing (continuous-integration)

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

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

Use the bottom edge from SDK.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:458
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/895/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6050/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/404/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6061/console

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

review: Needs Fixing (continuous-integration)

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

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.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:460
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/896/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6066/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/405/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6077/console

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

review: Needs Fixing (continuous-integration)

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

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

Fix exposing the bottom edge page with arguments.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:461
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/897/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6067/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/406/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6078/console

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

review: Needs Fixing (continuous-integration)

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

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

Merge trunk.

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

Fix qml tests.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:462
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/898/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6072/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/407/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6083/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:463
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/899/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6074/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/408/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6085/console

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

review: Needs Fixing (continuous-integration)

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

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.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:464
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/900/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6077/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/409/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6088/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:465
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/901/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6083/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/410/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6094/console

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

review: Needs Fixing (continuous-integration)

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

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

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

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:466
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/903/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6099/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/412/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6110/console

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

review: Needs Fixing (continuous-integration)

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

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

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:468
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/908/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6126/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/417/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6137/console

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

review: Needs Fixing (continuous-integration)

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

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.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:469
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/909/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6127/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/418/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6138/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:470
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/910/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6128/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/419/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6139/console

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

review: Needs Fixing (continuous-integration)

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

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

Another attempt at scrolling the list to the new item.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:471
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/911/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6140/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/420/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6151/console

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

review: Needs Fixing (continuous-integration)

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

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

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

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:472
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/912/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6150/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/421/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6161/console

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

review: Needs Fixing (continuous-integration)

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

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

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:474
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/913/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6182/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/422/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6193/console

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

review: Needs Fixing (continuous-integration)

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

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

Fix sending audio files.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:475
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/914/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6194/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/423/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6205/console

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

review: Needs Fixing (continuous-integration)

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

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

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

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:476
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/915/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6196/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/424/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6207/console

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

review: Needs Fixing (continuous-integration)

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

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

Make pep8 happy.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:477
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/916/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6220/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/425/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6231/console

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

review: Needs Fixing (continuous-integration)

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

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

Fix loading the contact viewing page.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:478
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/917/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6223/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/426/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6234/console

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

review: Needs Fixing (continuous-integration)

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

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

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

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:479
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/918/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6230/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/427/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6241/console

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

review: Needs Fixing (continuous-integration)

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

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.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:480
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/919/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6231/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/428/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6242/console

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

review: Needs Fixing (continuous-integration)

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

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

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

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:481
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/920/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6232/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/429/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6243/console

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

review: Needs Fixing (continuous-integration)

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

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

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-10-13 15:13:32 +0000
+++ CMakeLists.txt	2016-01-28 15:00:52 +0000
@@ -35,12 +35,7 @@
 # Instruct CMake to run moc automatically when needed.
 set(CMAKE_AUTOMOC ON)
 
-configure_file(config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h @ONLY)
-
-#find_package(Qt5Contacts)
 find_package(Qt5DBus)
-#find_package(Qt5Gui)
-#find_package(Qt5Multimedia)
 find_package(Qt5Qml)
 find_package(Qt5Quick)
 find_package(Qt5Test)
@@ -49,23 +44,24 @@
 include(qt5)
 
 find_package(PkgConfig REQUIRED)
-#pkg_check_modules(TP_QT5 REQUIRED TelepathyQt5)
-#pkg_check_modules(TPL_QT5 REQUIRED TelepathyLoggerQt5)
-#pkg_check_modules(QTGLIB REQUIRED QtGLib-2.0)
-#pkg_check_modules(GLIB REQUIRED glib-2.0)
 pkg_check_modules(NOTIFY REQUIRED libnotify)
-#pkg_check_modules(MESSAGING_MENU REQUIRED messaging-menu)
-
-# Check if the messaging menu has the message header
-#set(CMAKE_REQUIRED_INCLUDES ${MESSAGING_MENU_INCLUDE_DIRS})
-#check_include_file("messaging-menu-message.h" HAVE_MESSAGING_MENU_MESSAGE)
-
-if (HAVE_MESSAGING_MENU_MESSAGE)
-    add_definitions(-DHAVE_MESSAGING_MENU_MESSAGE)
-endif (HAVE_MESSAGING_MENU_MESSAGE)
+
+#find unity8 qml libraries
+set(UNITY8_QML_PATH /usr/lib/${CMAKE_C_LIBRARY_ARCHITECTURE}/unity8/qml/)
+find_path(LIB_UNITY_QML_EXISTS  NAMES libUnity-qml.so
+    HINTS "${UNITY8_QML_PATH}"
+    NO_CMAKE_PATH
+    NO_CMAKE_ENVIRONMENT_PATH
+    NO_SYSTEM_ENVIRONMENT_PATH
+)
+if(!LIB_UNITY_QML_EXISTS)
+    MESSAGE(FATAL_ERROR "unity8 private package not-found")
+endif()
 
 add_definitions(-DQT_NO_KEYWORDS)
 
+configure_file(config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h @ONLY)
+
 include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}

=== added file 'TODO.convergence'
--- TODO.convergence	1970-01-01 00:00:00 +0000
+++ TODO.convergence	2016-01-28 15:00:52 +0000
@@ -0,0 +1,3 @@
+- Right now if you call startChat() in the two panel layout, it won't match the
+  thread on the left side, and if you resize it to one panel, the conversation
+  is closed.

=== modified file 'config.h.in'
--- config.h.in	2014-05-28 20:28:55 +0000
+++ config.h.in	2016-01-28 15:00:52 +0000
@@ -27,6 +27,7 @@
 #include <QtDBus/QDBusReply>
 
 #define I18N_DIRECTORY "@CMAKE_INSTALL_PREFIX@/share/locale"
+#define UNITY8_QML_PATH "@UNITY8_QML_PATH@"
 
 inline bool isRunningInstalled() {
     static bool installed = (QCoreApplication::applicationDirPath() ==

=== modified file 'debian/control'
--- debian/control	2016-01-28 15:00:52 +0000
+++ debian/control	2016-01-28 15:00:52 +0000
@@ -2,8 +2,12 @@
 Section: x11
 Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
-Build-Depends: cmake,
+Build-Depends: apparmor,
+               apparmor-easyprof,
+               apparmor-easyprof-ubuntu (>= 1.3.13),
+               cmake,
                debhelper (>= 9),
+               dh-apparmor,
                dh-translations,
                libnotify-dev,
                python-flake8,

=== added file 'debian/messaging-app-apparmor.additions'
--- debian/messaging-app-apparmor.additions	1970-01-01 00:00:00 +0000
+++ debian/messaging-app-apparmor.additions	2016-01-28 15:00:52 +0000
@@ -0,0 +1,86 @@
+  @{HOME}/.local/share/history-service/attachments/** r,
+
+  # Description: Can access the telephony-service and related services
+  # Usage: reserved
+
+  # grant full access to telephony service handler and indicator
+  dbus (receive, send)
+       bus=session
+       peer=(name=com.canonical.TelephonyServiceHandler,label=unconfined),
+
+  dbus (receive, send)
+       bus=session
+       peer=(name=com.canonical.TelephonyServiceIndicator,label=unconfined),
+
+  # make it possible for apps to register a telepathy observer
+  dbus bind
+       bus=session
+       name=org.freedesktop.Telepathy.Client.*,
+
+  dbus (send)
+       interface="org.freedesktop.Notifications"
+       member="GetServerInformation",
+
+  dbus (send)
+       interface="org.freedesktop.Notifications"
+       member="Notify",
+
+  # query greeter status
+  dbus (receive, send)
+       bus=session
+       peer=(name=com.canonical.UnityGreeter,label=unconfined),
+
+  # access to telepathy-ofono and other telepathy clients/managers
+  dbus (receive, send)
+       bus=session
+       path=/org/freedesktop/Telepathy/**,
+
+  dbus (send)
+       bus=session
+       path="/ca/desrt/dconf/Writer/user"
+       interface="ca.desrt.dconf.Writer",
+
+  # used to query ringtone files and other properties
+  dbus (receive, send)
+       bus=system
+       path="/org/freedesktop/Accounts/User[0-9]*"
+       interface=org.freedesktop.DBus.Properties,
+
+  dbus (receive, send)
+       bus=session
+       path="/org/freedesktop/DBus"
+       interface=org.freedesktop.DBus,
+
+  # used by libtelephony-service to order/query existing modems
+  dbus (send)
+       bus=system
+       interface="org.ofono.Manager",
+
+  # used by apps to get sim contacts
+  dbus (send)
+       bus=system
+       interface="org.ofono.SimManager",
+
+  dbus (send)
+       bus=system
+       interface="org.ofono.Modem",
+
+  dbus (send, receive)
+       bus=session
+       peer=(name=com.meego.msyncd,label=unconfined),
+
+  # used by telepathy-qt to guess existing managers and their features
+  /usr/share/telepathy/managers/* r,
+  # read protocol files and assets
+  /usr/share/telephony-service/** r,
+
+  # Description: Can access urfkill
+  # Usage: common
+  #include <abstractions/nameservice>
+
+  allow dbus (receive, send)
+       bus=system
+       path=/org/freedesktop/URfkill,
+  allow dbus (receive, send)
+       bus=system
+       peer=(name=org.freedesktop.URfkill),

=== added file 'debian/messaging-app-apparmor.manifest'
--- debian/messaging-app-apparmor.manifest	1970-01-01 00:00:00 +0000
+++ debian/messaging-app-apparmor.manifest	2016-01-28 15:00:52 +0000
@@ -0,0 +1,37 @@
+{
+  "profiles": {
+    "messaging-app": {
+      "binary": "/usr/bin/messaging-app",
+      "profile_name": "messaging-app",
+      "policy_vendor": "ubuntu",
+      "policy_version": 1.3,
+      "policy_groups": [
+        "accounts",
+        "audio",
+        "contacts",
+        "content_exchange",
+        "content_exchange_source",
+        "history",
+        "microphone",
+        "video"
+      ],
+      "abstractions": [
+        "user-tmp"
+      ],
+      "template_variables": {
+        "APP_ID_DBUS": "messaging_2dapp",
+        "APP_PKGNAME_DBUS": "messaging_2dapp",
+        "APP_PKGNAME": "com.ubuntu.messaging-app"
+      },
+      "read_path": [
+        "/usr/share/applications/",
+        "/custom/xdg/data/dconf/",
+        "/usr/share/*/assets/",
+        "@{HOME}/.local/share/evolution/addressbook/*/photos/",
+        "@{HOME}/.cache/messaging-app/HubIncoming/**",
+        "@{HOME}/.config/dconf/user",
+        "/usr/share/messaging-app/"
+      ]
+    }
+  }
+}

=== modified file 'debian/messaging-app.install'
--- debian/messaging-app.install	2016-01-28 15:00:52 +0000
+++ debian/messaging-app.install	2016-01-28 15:00:52 +0000
@@ -10,3 +10,4 @@
 usr/share/messaging-app/Dialogs/*.qml
 usr/share/messaging-app/Stickers/*.qml
 usr/bin/*messaging-app*
+debian/usr.bin.messaging-app etc/apparmor.d

=== modified file 'debian/rules'
--- debian/rules	2014-08-26 21:26:33 +0000
+++ debian/rules	2016-01-28 15:00:52 +0000
@@ -4,11 +4,33 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+export DEB_BUILD_HARDENING=1
 export DPKG_GENSYMBOLS_CHECK_LEVEL=4
 
 %:
 	dh $@ --parallel --fail-missing --with translations
 
+apparmor:
+	aa-easyprof -m ./debian/messaging-app-apparmor.manifest --no-verify | \
+	egrep -v '(# Click packages|CLICK_DIR)' | \
+	sed 's/@{APP_PKGNAME}_@{APP_APPNAME}_@{APP_VERSION}/@{APP_PKGNAME}/g' | \
+	sed 's,Apps/@{APP_PKGNAME},Apps/messaging-app,g' | \
+	sed '/lttng-ust-/c\  \/{,var\/}run\/shm\/lttng-ust-* r,'  | \
+	sed '/dconf.user rw/c\  \/run\/user\/\[0-9\]*\/dconf\/user rw,' \
+	> ./debian/usr.bin.messaging-app
+	(head -n -2 ./debian/usr.bin.messaging-app; cat ./debian/messaging-app-apparmor.additions; \
+	echo } ) > ./debian/usr.bin.messaging-app2
+	mv ./debian/usr.bin.messaging-app2 ./debian/usr.bin.messaging-app
+	apparmor_parser -QTK ./debian/usr.bin.messaging-app
+
+override_dh_install: apparmor
+	dh_install --fail-missing
+
+override_dh_installdeb:
+	dh_apparmor --profile-name=usr.bin.messaging-app -pmessaging-app
+	dh_installdeb
+
+
 override_dh_auto_test:
 	flake8  tests/autopilot/messaging_app/
 	cd obj-$(DEB_HOST_GNU_TYPE); ctest -V

=== modified file 'src/fileoperations.cpp'
--- src/fileoperations.cpp	2016-01-28 15:00:52 +0000
+++ src/fileoperations.cpp	2016-01-28 15:00:52 +0000
@@ -24,6 +24,7 @@
 #include <QDir>
 #include <QFile>
 #include <QTemporaryFile>
+#include <QStandardPaths>
 
 FileOperations::FileOperations(QObject *parent)
     : QObject(parent)
@@ -37,7 +38,11 @@
 QString FileOperations::getTemporaryFile(const QString &fileExtension) const
 {
     //TODO remove once lp:1420728 is fixed
-    QTemporaryFile tmp(QDir::tempPath() + "/tmpXXXXXX" + fileExtension);
+    QDir dataLocation(QStandardPaths::writableLocation(QStandardPaths::CacheLocation));
+    if (!dataLocation.exists()) {
+        dataLocation.mkpath(".");
+    }
+    QTemporaryFile tmp(dataLocation.path() + "/tmpXXXXXX" + fileExtension);
     tmp.open();
     return tmp.fileName();
 }

=== modified file 'src/messagingapplication.cpp'
--- src/messagingapplication.cpp	2016-01-28 15:00:52 +0000
+++ src/messagingapplication.cpp	2016-01-28 15:00:52 +0000
@@ -165,6 +165,7 @@
     m_view->rootContext()->setContextProperty("application", this);
     m_view->rootContext()->setContextProperty("i18nDirectory", I18N_DIRECTORY);
     m_view->engine()->setBaseUrl(QUrl::fromLocalFile(messagingAppDirectory()));
+    m_view->engine()->addImportPath(UNITY8_QML_PATH);
 
     // check if there is a contacts backend override
     QString contactsBackend = qgetenv("QTCONTACTS_MANAGER_OVERRIDE");

=== modified file 'src/qml/AudioRecordingBar.qml'
--- src/qml/AudioRecordingBar.qml	2016-01-28 15:00:52 +0000
+++ src/qml/AudioRecordingBar.qml	2016-01-28 15:00:52 +0000
@@ -18,6 +18,7 @@
 
 import QtQuick 2.0
 import Ubuntu.Components 1.3
+import Ubuntu.Components.Popups 1.3
 import messagingapp.private 0.1
 import "dateUtils.js" as DateUtils
 
@@ -26,6 +27,7 @@
     opacity: audioRecorder.recording ? 1.0 : 0.0
     Behavior on opacity { UbuntuNumberAnimation {} }
     visible: opacity > 0
+    property bool handleError: false
 
     property int duration: 0
     readonly property bool recording: audioRecorder.recording
@@ -34,6 +36,7 @@
     signal audioRecorded(var audio)
 
     function startRecording() {
+        handleError = true
         audioRecorder.record()
     }
 
@@ -44,7 +47,7 @@
     Loader {
         id: audioRecorder
         readonly property bool ready: status == Loader.Ready
-        readonly property bool recording: ready ? item.recorderState == AudioRecorder.RecordingState : false
+        readonly property bool recording: ready ? item.recorderStatus == AudioRecorder.RecordingStatus : false
         readonly property int duration: ready ? item.duration : 0
         function record() {
             audioRecorder.active = true
@@ -62,9 +65,9 @@
     Component {
         id: audioRecorderComponent
         AudioRecorder {
-            readonly property bool recording: recorderState == AudioRecorder.RecordingState
+            readonly property bool recording: recorderStatus == AudioRecorder.RecordingStatus
 
-            onRecorderStateChanged: {
+            onRecorderStatusChanged: {
                 if (recorderState == AudioRecorder.StoppedState && actualLocation != "") {
                     var filePath = actualLocation
 
@@ -82,12 +85,33 @@
                     recordingBar.duration = duration
                 }
             }
-
+            onErrorChanged: {
+                switch(errorCode) {
+                    case AudioRecorder.ResourceError:
+                        if (handleError) {
+                            timer.start()
+                        }
+                        break
+                    default:
+                }
+            }
             codec: "audio/vorbis"
             quality: AudioRecorder.VeryHighQuality
         }
     }
 
+    // WORKAROUND we can't trigger the dialog from the onErrorChanged signal.
+    Timer {
+        id: timer
+        interval: 1
+        onTriggered: {
+            Qt.inputMethod.hide()
+            messages.focus = false
+            PopupUtils.open(Qt.createComponent("Dialogs/NoMicrophonePermission.qml").createObject(messages))
+            handleError = false
+        }
+    }
+
     TransparentButton {
         id: recordingIcon
         objectName: "recordingIcon"

=== modified file 'src/qml/ComposeBar.qml'
--- src/qml/ComposeBar.qml	2016-01-28 15:00:52 +0000
+++ src/qml/ComposeBar.qml	2016-01-28 15:00:52 +0000
@@ -23,6 +23,7 @@
 import Ubuntu.Components.Popups 1.3
 import Ubuntu.Content 0.1
 import Ubuntu.Telephony 0.1
+import messagingapp.private 0.1
 import "Stickers"
 
 Item {
@@ -63,6 +64,10 @@
     }
 
     function addAttachments(transfer) {
+        if (!transfer || !transfer.items) {
+            return
+        }
+
         for (var i = 0; i < transfer.items.length; i++) {
             if (String(transfer.items[i].text).length > 0) {
                 composeBar.text = String(transfer.items[i].text)

=== added file 'src/qml/Dialogs/NoMicrophonePermission.qml'
--- src/qml/Dialogs/NoMicrophonePermission.qml	1970-01-01 00:00:00 +0000
+++ src/qml/Dialogs/NoMicrophonePermission.qml	2016-01-28 15:00:52 +0000
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2016 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("No permission to access microphone")
+        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("Please grant access on <a href=\"system_settings\">System Settings &gt; Security &amp; Privacy</a>.")
+                wrapMode: Text.WordWrap
+                onLinkActivated: {
+                    PopupUtils.close(dialogue)
+                    Qt.openUrlExternally("settings:///system/security-privacy")
+                }
+            }
+            Row {
+                spacing: units.gu(4)
+                anchors.horizontalCenter: parent.horizontalCenter
+                Button {
+                    objectName: "okNoMicrophonePermission"
+                    text: i18n.tr("Ok")
+                    color: UbuntuColors.orange
+                    onClicked: {
+                        PopupUtils.close(dialogue)
+                    }
+                }
+            }
+        }
+    }
+}

=== added file 'src/qml/EmptyState.qml'
--- src/qml/EmptyState.qml	1970-01-01 00:00:00 +0000
+++ src/qml/EmptyState.qml	2016-01-28 15:00:52 +0000
@@ -0,0 +1,38 @@
+import QtQuick 2.0
+import Ubuntu.Components 1.3
+
+Item {
+    id: emptyStateScreen
+
+    property alias labelVisible: emptyStateLabel.visible
+
+    anchors {
+        left: parent.left
+        leftMargin: units.gu(6)
+        right: parent.right
+        rightMargin: units.gu(6)
+        verticalCenter: parent.verticalCenter
+    }
+    height: childrenRect.height
+    Icon {
+        id: emptyStateIcon
+        anchors.top: emptyStateScreen.top
+        anchors.horizontalCenter: parent.horizontalCenter
+        height: units.gu(5)
+        width: height
+        opacity: 0.3
+        name: "message"
+    }
+    Label {
+        id: emptyStateLabel
+        anchors.top: emptyStateIcon.bottom
+        anchors.topMargin: units.gu(2)
+        anchors.left: parent.left
+        anchors.right: parent.right
+        text: i18n.tr("Compose a new message by swiping up from the bottom of the screen.")
+        color: "#5d5d5d"
+        fontSize: "x-large"
+        wrapMode: Text.WordWrap
+        horizontalAlignment: Text.AlignHCenter
+    }
+}

=== added file 'src/qml/InputInfo.qml'
--- src/qml/InputInfo.qml	1970-01-01 00:00:00 +0000
+++ src/qml/InputInfo.qml	2016-01-28 15:00:52 +0000
@@ -0,0 +1,24 @@
+import QtQuick 2.0
+//import Unity.InputInfo 0.1
+
+Item {
+    // FIXME: implement correctly without relying on unity private stuff
+    property bool hasMouse: mainView.dualPanel //miceModel.count > 0 || touchPadModel.count > 0
+    property bool hasKeyboard: false //keyboardsModel.count > 0
+
+    /*InputDeviceModel {
+        id: miceModel
+        deviceFilter: InputInfo.Mouse
+    }
+
+    InputDeviceModel {
+        id: touchPadModel
+        deviceFilter: InputInfo.TouchPad
+    }
+
+    InputDeviceModel {
+        id: keyboardsModel
+        deviceFilter: InputInfo.Keyboard
+    }*/
+}
+

=== removed file 'src/qml/LocalPageWithBottomEdge.qml'
--- src/qml/LocalPageWithBottomEdge.qml	2015-09-14 13:51:27 +0000
+++ src/qml/LocalPageWithBottomEdge.qml	1970-01-01 00:00:00 +0000
@@ -1,428 +0,0 @@
-/*
- * Copyright (C) 2014 Canonical, Ltd.
- *
- * This program 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.
- *
- * This program 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/>.
- */
-
-/*
-    Example:
-
-    MainView {
-        objectName: "mainView"
-
-        applicationName: "com.ubuntu.developer.boiko.bottomedge"
-
-        width: units.gu(100)
-        height: units.gu(75)
-
-        Component {
-            id: pageComponent
-
-            PageWithBottomEdge {
-                id: mainPage
-                title: i18n.tr("Main Page")
-
-                Rectangle {
-                    anchors.fill: parent
-                    color: "white"
-                }
-
-                bottomEdgePageComponent: Page {
-                    title: "Contents"
-                    anchors.fill: parent
-                    //anchors.topMargin: contentsPage.flickable.contentY
-
-                    ListView {
-                        anchors.fill: parent
-                        model: 50
-                        delegate: ListItems.Standard {
-                            text: "One Content Item: " + index
-                        }
-                    }
-                }
-                bottomEdgeTitle: i18n.tr("Bottom edge action")
-            }
-        }
-
-        PageStack {
-            id: stack
-            Component.onCompleted: stack.push(pageComponent)
-        }
-    }
-
-*/
-
-import QtQuick 2.2
-import Ubuntu.Components 1.3
-
-Page {
-    id: page
-
-    property alias bottomEdgePageComponent: edgeLoader.sourceComponent
-    property alias bottomEdgePageSource: edgeLoader.source
-    property alias bottomEdgeTitle: tipLabel.text
-    property bool bottomEdgeEnabled: true
-    property int bottomEdgeExpandThreshold: page.height * 0.2
-    property int bottomEdgeExposedArea: bottomEdge.state !== "expanded" ? (page.height - bottomEdge.y - bottomEdge.tipHeight) : _areaWhenExpanded
-    property bool reloadBottomEdgePage: true
-
-    readonly property alias bottomEdgePage: edgeLoader.item
-    readonly property bool isReady: ((bottomEdge.y === 0) && bottomEdgePageLoaded && edgeLoader.item.active)
-    readonly property bool isCollapsed: (bottomEdge.y === page.height)
-    readonly property bool bottomEdgePageLoaded: (edgeLoader.status == Loader.Ready)
-    property var temporaryProperties: null
-
-    property bool _showEdgePageWhenReady: false
-    property int _areaWhenExpanded: 0
-
-    signal bottomEdgeReleased()
-    signal bottomEdgeDismissed()
-
-
-    function showBottomEdgePage(source, properties)
-    {
-        edgeLoader.setSource(source, properties)
-        temporaryProperties = properties
-        _showEdgePageWhenReady = true
-    }
-
-    function setBottomEdgePage(source, properties)
-    {
-        edgeLoader.setSource(source, properties)
-    }
-
-    function _pushPage()
-    {
-        if (edgeLoader.status === Loader.Ready) {
-            edgeLoader.item.active = true
-            page.pageStack.push(edgeLoader.item)
-            if (edgeLoader.item.flickable) {
-                edgeLoader.item.flickable.contentY = -page.header.height
-                edgeLoader.item.flickable.returnToBounds()
-            }
-            if (edgeLoader.item.ready)
-                edgeLoader.item.ready()
-        }
-    }
-
-
-    Component.onCompleted: {
-        // avoid a binding on the expanded height value
-        var expandedHeight = height;
-        _areaWhenExpanded = expandedHeight;
-    }
-
-    onActiveChanged: {
-        if (active) {
-            bottomEdge.state = "collapsed"
-        }
-    }
-
-    onBottomEdgePageLoadedChanged: {
-        if (_showEdgePageWhenReady && bottomEdgePageLoaded) {
-            bottomEdge.state = "expanded"
-            _showEdgePageWhenReady = false
-        }
-    }
-
-    InverseMouseArea {
-        anchors.fill: edgeLoader.item
-        sensingArea: mainView
-        enabled: !tip.hidden
-        onPressed: {
-            mouse.accepted = false
-            page.focus = false
-        }
-        z: 1
-    }
-
-    Rectangle {
-        id: bgVisual
-
-        color: "black"
-        anchors.fill: page
-        opacity: 0.7 * ((page.height - bottomEdge.y) / page.height)
-        z: 1
-    }
-
-    UbuntuShape {
-        id: tip
-        objectName: "bottomEdgeTip"
-
-        property bool hidden: (activeFocus === false) || ((bottomEdge.y - units.gu(1)) < tip.y)
-
-        enabled: mouseArea.enabled
-        anchors {
-            bottom: parent.bottom
-            horizontalCenter: bottomEdge.horizontalCenter
-            bottomMargin: hidden ? - height + units.gu(1) : -units.gu(1)
-            Behavior on bottomMargin {
-                SequentialAnimation {
-                    // wait some msecs in case of the focus change again, to avoid flickering
-                    PauseAnimation {
-                        duration: 300
-                    }
-                    UbuntuNumberAnimation {
-                        duration: UbuntuAnimation.SnapDuration
-                    }
-                }
-            }
-        }
-
-        z: 1
-        width: tipLabel.paintedWidth + units.gu(6)
-        height: bottomEdge.tipHeight + units.gu(1)
-        color: Theme.palette.normal.overlay
-        Label {
-            id: tipLabel
-
-            anchors {
-                top: parent.top
-                left: parent.left
-                right: parent.right
-            }
-            height: bottomEdge.tipHeight
-            verticalAlignment: Text.AlignVCenter
-            horizontalAlignment: Text.AlignHCenter
-            opacity: tip.hidden ? 0.0 : 1.0
-            Behavior on opacity {
-                UbuntuNumberAnimation {
-                    duration: UbuntuAnimation.SnapDuration
-                }
-            }
-        }
-    }
-
-    Rectangle {
-        id: shadow
-
-        anchors {
-            left: parent.left
-            right: parent.right
-            bottom: parent.bottom
-        }
-        height: units.gu(1)
-        z: 1
-        opacity: 0.0
-        gradient: Gradient {
-            GradientStop { position: 0.0; color: "transparent" }
-            GradientStop { position: 1.0; color: Qt.rgba(0, 0, 0, 0.2) }
-        }
-    }
-
-    MouseArea {
-        id: mouseArea
-
-        property real previousY: -1
-        property string dragDirection: "None"
-
-        preventStealing: true
-        drag {
-            axis: Drag.YAxis
-            target: bottomEdge
-            minimumY: bottomEdge.pageStartY
-            maximumY: page.height
-        }
-        enabled: edgeLoader.status == Loader.Ready
-
-        anchors {
-            left: parent.left
-            right: parent.right
-            bottom: parent.bottom
-
-        }
-        height: bottomEdge.tipHeight
-        z: 1
-
-        onReleased: {
-            page.bottomEdgeReleased()
-            if ((dragDirection === "BottomToTop") &&
-                bottomEdge.y < (page.height - bottomEdgeExpandThreshold - bottomEdge.tipHeight)) {
-                bottomEdge.state = "expanded"
-            } else {
-                bottomEdge.state = "collapsed"
-            }
-            previousY = -1
-            dragDirection = "None"
-        }
-
-        onPressed: {
-            previousY = mouse.y
-            tip.forceActiveFocus()
-        }
-
-        onMouseYChanged: {
-            var yOffset = previousY - mouseY
-            // skip if was a small move
-            if (Math.abs(yOffset) <= units.gu(2)) {
-                return
-            }
-            previousY = mouseY
-            dragDirection = yOffset > 0 ? "BottomToTop" : "TopToBottom"
-        }
-    }
-
-    Rectangle {
-        id: bottomEdge
-        objectName: "bottomEdge"
-
-        readonly property int tipHeight: units.gu(3)
-        readonly property int pageStartY: 0
-
-        z: 1
-        color: Theme.palette.normal.background
-        clip: true
-        anchors {
-            left: parent.left
-            right: parent.right
-        }
-        height: page.height
-        y: height
-        visible: page.bottomEdgeEnabled && !page.isCollapsed
-        state: "collapsed"
-        states: [
-            State {
-                name: "collapsed"
-                PropertyChanges {
-                    target: bottomEdge
-                    y: bottomEdge.height
-                }
-            },
-            State {
-                name: "expanded"
-                PropertyChanges {
-                    target: bottomEdge
-                    y: bottomEdge.pageStartY
-                }
-            },
-            State {
-                name: "floating"
-                when: mouseArea.drag.active
-                PropertyChanges {
-                    target: shadow
-                    opacity: 1.0
-                }
-            }
-        ]
-
-        transitions: [
-            Transition {
-                to: "expanded"
-                SequentialAnimation {
-                    alwaysRunToEnd: true
-
-                    SmoothedAnimation {
-                        target: bottomEdge
-                        property: "y"
-                        duration: UbuntuAnimation.FastDuration
-                        easing.type: Easing.Linear
-                    }
-                    SmoothedAnimation {
-                        target: edgeLoader
-                        property: "anchors.topMargin"
-                        to: - units.gu(4)
-                        duration: UbuntuAnimation.FastDuration
-                        easing.type: Easing.Linear
-                    }
-                    SmoothedAnimation {
-                        target: edgeLoader
-                        property: "anchors.topMargin"
-                        to: 0
-                        duration: UbuntuAnimation.FastDuration
-                        easing: UbuntuAnimation.StandardEasing
-                    }
-                    ScriptAction {
-                        script: page._pushPage()
-                    }
-                }
-            },
-            Transition {
-                from: "expanded"
-                to: "collapsed"
-                SequentialAnimation {
-                    alwaysRunToEnd: true
-
-                    ScriptAction {
-                        script: {
-                            Qt.inputMethod.hide()
-                            edgeLoader.item.parent = edgeLoader
-                            edgeLoader.item.anchors.fill = edgeLoader
-                            edgeLoader.item.active = false
-                        }
-                    }
-                    SmoothedAnimation {
-                        target: bottomEdge
-                        property: "y"
-                        duration: UbuntuAnimation.SlowDuration
-                    }
-                    ScriptAction {
-                        script: {
-                            // destroy current bottom page
-                            if (page.reloadBottomEdgePage) {
-                                edgeLoader.active = false
-                                // remove properties from old instance
-                                if (edgeLoader.source !== "") {
-                                    var properties = {}
-                                    if (temporaryProperties !== null) {
-                                        properties = temporaryProperties
-                                        temporaryProperties = null
-                                    }
-
-                                    edgeLoader.setSource(edgeLoader.source, properties)
-                                }
-                                // tip will receive focus on page active true
-                            } else {
-                                tip.forceActiveFocus()
-                            }
-
-                            // notify
-                            page.bottomEdgeDismissed()
-
-                            edgeLoader.active = true
-                        }
-                    }
-                }
-            },
-            Transition {
-                from: "floating"
-                to: "collapsed"
-                SmoothedAnimation {
-                    target: bottomEdge
-                    property: "y"
-                    duration: UbuntuAnimation.FastDuration
-                }
-            }
-        ]
-
-        Loader {
-            id: edgeLoader
-
-            asynchronous: true
-            anchors.fill: parent
-            //WORKAROUND: The SDK move the page contents down to allocate space for the header we need to avoid that during the page dragging
-            Binding {
-                target: edgeLoader.status === Loader.Ready ? edgeLoader : null
-                property: "anchors.topMargin"
-                value:  edgeLoader.item && edgeLoader.item.flickable ? edgeLoader.item.flickable.contentY : 0
-                when: !page.isReady
-            }
-
-            onLoaded: {
-                tip.forceActiveFocus()
-                if (page.isReady && edgeLoader.item.active !== true) {
-                    page._pushPage()
-                }
-            }
-        }
-    }
-}

=== modified file 'src/qml/MMS/MMSAudio.qml'
--- src/qml/MMS/MMSAudio.qml	2016-01-28 15:00:52 +0000
+++ src/qml/MMS/MMSAudio.qml	2016-01-28 15:00:52 +0000
@@ -32,15 +32,6 @@
     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)
@@ -63,7 +54,15 @@
         readonly property int playbackState: ready ? item.playbackState : Audio.StoppedState
         property bool muted: false
         property string source: ""
-        function play() { 
+        function play() {
+            var tmpFile = FileOperations.getTemporaryFile(".ogg")
+            if (FileOperations.link(attachment.filePath, tmpFile)) {
+                source = tmpFile;
+            } else {
+                console.log("MMSAudio: Failed to link", attachment.filePath, "to", tmpFile)
+                return
+            }
+
             audioPlayer.active = true
             item.play() 
         }
@@ -76,6 +75,7 @@
         function seek(pos) { item.seek(pos) }
         active: false
         sourceComponent: audioPlayerComponent
+        Component.onDestruction: FileOperations.remove(source)
     }
 
     Component {
@@ -104,7 +104,6 @@
 
         spacing: units.gu(1)
         sideBySide: true
-        enabled: audioPlayer.source != ""
         iconColor: audioDelegate.textColor
         iconName: audioPlayer.playing ? "media-playback-pause" : "media-playback-start"
 

=== 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-28 15:00:52 +0000
@@ -31,7 +31,7 @@
 
     function handleAttachment(filePath, handlerType)
     {
-        mainStack.push(picker, {"url": filePath, "handler": handlerType});
+        mainStack.addPageToCurrentColumn(previewerPage, picker, {"url": filePath, "handler": handlerType});
         actionTriggered()
     }
 
@@ -45,23 +45,29 @@
         previewerPage.handleAttachment(attachment.filePath, ContentHandler.Share)
     }
 
-    function backAction()
-    {
-        mainStack.pop()
+    header: PageHeader {
+        id: pageHeader
+
+        property alias leadingActions: leadingBar.actions
+        property alias trailingActions: trailingBar.actions
+
+        title: ""
+        leadingActionBar {
+            id: leadingBar
+        }
+
+        trailingActionBar {
+            id: trailingBar
+        }
     }
 
-    title: ""
     state: "default"
     states: [
-        PageHeadState {
+        State {
+            id: defaultState
             name: "default"
-            head: previewerPage.head
-            backAction: Action {
-                iconName: "back"
-                text: i18n.tr("Back")
-                onTriggered: previewerPage.backAction()
-            }
-            actions: [
+
+            property list<QtObject> trailingActions: [
                 Action {
                     objectName: "saveButton"
                     text: i18n.tr("Save")
@@ -75,6 +81,11 @@
                     onTriggered: previewerPage.shareAttchment()
                 }
             ]
+            PropertyChanges {
+                target: pageHeader
+
+                trailingActions: defaultState.trailingActions
+            }
         }
     ]
 
@@ -109,11 +120,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	2016-01-28 15:00:52 +0000
+++ src/qml/MMS/PreviewerImage.qml	2016-01-28 15:00:52 +0000
@@ -25,6 +25,7 @@
 Previewer {
     id: imagePreviewer
 
+    // FIXME: this won't work correctly in windowed mode
     Component.onCompleted: application.fullscreen = true
     Component.onDestruction: application.fullscreen = false
 

=== modified file 'src/qml/MMS/PreviewerMultipleContacts.qml'
--- src/qml/MMS/PreviewerMultipleContacts.qml	2015-11-19 00:34:45 +0000
+++ src/qml/MMS/PreviewerMultipleContacts.qml	2016-01-28 15:00:52 +0000
@@ -51,7 +51,7 @@
             property var contact: thumbnail.vcard.contacts[index]
 
             onClicked: {
-                mainStack.push(sigleContatPreviewer, {'contact': contact})
+                mainStack.addPageToCurrentColumn(root, sigleContatPreviewer, {'contact': contact})
             }
         }
     }

=== modified file 'src/qml/MMS/PreviewerVideo.qml'
--- src/qml/MMS/PreviewerVideo.qml	2016-01-28 15:00:52 +0000
+++ src/qml/MMS/PreviewerVideo.qml	2016-01-28 15:00:52 +0000
@@ -30,6 +30,7 @@
     title: i18n.tr("Video Preview")
     clip: true
 
+    // FIXME: this won't work correctly in windowed mode
     Component.onCompleted: {
         application.fullscreen = true
         // Load Video player after toggling fullscreen to reduce flickering

=== modified file 'src/qml/MMSDelegate.qml'
--- src/qml/MMSDelegate.qml	2016-01-28 15:00:52 +0000
+++ src/qml/MMSDelegate.qml	2016-01-28 15:00:52 +0000
@@ -45,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.basePage, Qt.resolvedUrl(attachment.item.previewer), properties)
         }
     }
 

=== modified file 'src/qml/MainPage.qml'
--- src/qml/MainPage.qml	2016-01-28 15:00:52 +0000
+++ src/qml/MainPage.qml	2016-01-28 15:00:52 +0000
@@ -23,29 +23,25 @@
 import Ubuntu.History 0.1
 import "dateUtils.js" as DateUtils
 
-LocalPageWithBottomEdge {
+Page {
     id: mainPage
     property alias selectionMode: threadList.isInSelectionMode
     property bool searching: false
+    property bool isEmpty: threadCount == 0 && !threadModel.canFetchMore
     property alias threadCount: threadList.count
+    property alias displayedThreadIndex: threadList.currentIndex
 
     function startSelection() {
         threadList.startSelection()
     }
 
-    state: selectionMode ? "select" : searching ? "search" : "default"
-    title: selectionMode ? " " : i18n.tr("Messages")
-    flickable: null
-
-    bottomEdgeEnabled: !selectionMode && !searching
-    bottomEdgeTitle: i18n.tr("+")
-    bottomEdgePageComponent: Messages { active: false }
-
     TextField {
         id: searchField
         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 +56,30 @@
         }
     }
 
+    header: PageHeader {
+        id: pageHeader
+
+        property alias leadingActions: leadingBar.actions
+        property alias trailingActions: trailingBar.actions
+
+        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 +92,63 @@
                     objectName: "settingsAction"
                     text: i18n.tr("Settings")
                     iconName: "settings"
-                    onTriggered: pageStack.push(Qt.resolvedUrl("SettingsPage.qml"))
+                    onTriggered: pageStack.addPageToNextColumn(mainPage, Qt.resolvedUrl("SettingsPage.qml"))
+                },
+                Action {
+                    objectName: "newMessageAction"
+                    text: i18n.tr("New message")
+                    iconName: "add"
+                    visible: dualPanel
+                    onTriggered: mainView.bottomEdge.commit()
                 }
+
             ]
+
+            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,39 +161,18 @@
                     onTriggered: threadList.endSelection()
                 }
             ]
+            PropertyChanges {
+                target: pageHeader
+                title: " "
+                leadingActions: selectionState.leadingActions
+                trailingActions: selectionState.trailingActions
+            }
         }
     ]
 
-    Item {
+    EmptyState {
         id: emptyStateScreen
-        anchors.left: parent.left
-        anchors.leftMargin: units.gu(6)
-        anchors.right: parent.right
-        anchors.rightMargin: units.gu(6)
-        height: childrenRect.height
-        anchors.verticalCenter: parent.verticalCenter
-        visible: threadCount == 0 && !threadModel.canFetchMore
-        Icon {
-            id: emptyStateIcon
-            anchors.top: emptyStateScreen.top
-            anchors.horizontalCenter: parent.horizontalCenter
-            height: units.gu(5)
-            width: height
-            opacity: 0.3
-            name: "message"
-        }
-        Label {
-            id: emptyStateLabel
-            anchors.top: emptyStateIcon.bottom
-            anchors.topMargin: units.gu(2)
-            anchors.left: parent.left
-            anchors.right: parent.right
-            text: i18n.tr("Compose a new message by swiping up from the bottom of the screen.")
-            color: "#5d5d5d"
-            fontSize: "x-large"
-            wrapMode: Text.WordWrap
-            horizontalAlignment: Text.AlignHCenter
-        }
+        visible: mainPage.isEmpty && !mainView.dualPanel
     }
 
     Component {
@@ -188,8 +211,18 @@
         clip: true
         cacheBuffer: threadList.height * 2
         section.property: "eventDate"
+        currentIndex: -1
         //spacing: searchField.text === "" ? units.gu(-2) : 0
         section.delegate: searching && searchField.text !== ""  ? null : sectionDelegate
+        header: ListItem.Standard {
+            id: newItem
+            height: mainView.bottomEdge.status === BottomEdge.Committed ? units.gu(10) : 0
+            text: i18n.tr("New message")
+            iconName: "message-new"
+            iconFrame: false
+            selected: true
+        }
+
         listDelegate: ThreadDelegate {
             id: threadDelegate
             // FIXME: find a better unique name
@@ -201,7 +234,15 @@
             }
             height: units.gu(8)
             selectionMode: threadList.isInSelectionMode
-            selected: threadList.isSelected(threadDelegate)
+            selected: {
+                if (selectionMode) {
+                    return threadList.isSelected(threadDelegate)
+                } else {
+                    // FIXME: there might be a better way of doing this
+                    return index === threadList.currentIndex && mainView.bottomEdge.status !== BottomEdge.Committed
+                }
+            }
+
             searchTerm: mainPage.searching ? searchField.text : ""
             onItemClicked: {
                 if (threadList.isInSelectionMode) {
@@ -222,7 +263,10 @@
                     if (displayedEvent != null) {
                         properties["scrollToEventId"] = displayedEvent.eventId
                     }
-                    mainStack.push(Qt.resolvedUrl("Messages.qml"), properties)
+                    mainStack.addPageToNextColumn(mainPage, messagesWithBottomEdge, properties)
+
+                    // mark this item as current
+                    threadList.currentIndex = index
                 }
             }
             onItemPressAndHold: {
@@ -242,6 +286,13 @@
                 mainView.removeThreads(threadsToRemove);
             }
         }
+
+        Binding {
+            target: threadList
+            property: 'contentY'
+            value: -threadList.headerItem.height
+            when: mainView.composingNewMessage
+        }
     }
 
     KeyboardRectangle {
@@ -252,4 +303,12 @@
         flickableItem: threadList
         align: Qt.AlignTrailing
     }
+
+    Loader {
+        id: bottomEdgeLoader
+        active: !selectionMode && !searching && !mainView.dualPanel
+        sourceComponent: MessagingBottomEdge {
+            parent: mainPage
+        }
+    }
 }

=== modified file 'src/qml/Messages.qml'
--- src/qml/Messages.qml	2016-01-28 15:00:52 +0000
+++ src/qml/Messages.qml	2016-01-28 15:00:52 +0000
@@ -63,6 +63,19 @@
     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
+
+
+    // When using this view from the bottom edge, we are not in the stack, so we need to push on top of the parent page
+    property var basePage: messages
+
+    property bool startedFromBottomEdge: false
+
+    signal ready
+    signal cancel
 
     function getAccountsModel() {
         var accounts = []
@@ -221,99 +234,6 @@
         return thread
     }
 
-    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 sendMessageNetworkCheck() {
         if (messages.account.simLocked) {
             Qt.inputMethod.hide()
@@ -363,7 +283,7 @@
             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;
                 }
@@ -425,7 +345,7 @@
             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. 
+                // and use it in the telepathy-ofono account as selfContactId.
                 return false
             }
             var fallbackAccountId = chatManager.sendMessage(messages.account.accountId, participantIds, text, attachments, properties)
@@ -448,102 +368,6 @@
         return 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 ""
-            }
-            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
-    }
-
-    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
-                }
-            }
-        }
-        composeBar.addAttachments(sharedAttachmentsTransfer)
-    }
-
-    onActiveChanged: {
-        if (active && (eventModel.count > 0)){
-            swipeItemDemo.enable()
-        }
-    }
-
     function updateFilters(accounts, participants, reload, threads) {
         if (participants.length == 0 || accounts.length == 0) {
             return null
@@ -603,8 +427,322 @@
         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()
+            onSelectedIndexChanged: {
+                if (selectedIndex >= 0) {
+                    messages.account = messages.accountsModel[selectedIndex]
+                }
+            }
+        }
+
+        extension: sections.model.length > 1 ? sections : null
+
+        leadingActionBar {
+            id: leadingBar
+
+            property list<QtObject> bottomEdgeLeadingActions: [
+                Action {
+                    id: backAction
+
+                    objectName: "cancel"
+                    name: "cancel"
+                    text: i18n.tr("Cancel")
+                    iconName: "down"
+                    shortcut: "Esc"
+                    onTriggered: {
+                        messages.cancel()
+                    }
+                }
+            ]
+
+            actions: startedFromBottomEdge ? bottomEdgeLeadingActions : []
+        }
+
+        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, pageHeader)
+                }
+            ]
+
+            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(basePage, 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)
+                }
+                focus: true
+
+                Connections {
+                    target: mainView.bottomEdge
+                    onStatusChanged: {
+                        if (mainView.bottomEdge.status === BottomEdge.Committed) {
+                            multiRecipient.forceFocus()
+                        }
+                    }
+                }
+            }
+
+            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)
+    }
+
+    Component.onDestruction: {
+        if (!mainView.dualPanel) {
+            mainPage.displayedThreadIndex = -1
+        }
+    }
+
+    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) {
@@ -616,6 +754,91 @@
         }
     }
 
+    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: 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 ""
+            }
+            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 {
         id: participantsPopover
 
@@ -678,13 +901,6 @@
         }
     }
 
-    Connections {
-        target: messages.head.sections
-        onSelectedIndexChanged: {
-            messages.account = messages.accountsModel[head.sections.selectedIndex]
-        }
-    }
-
     Loader {
         id: searchListLoader
 
@@ -696,7 +912,7 @@
         visible: source != ""
         anchors {
             top: parent.top
-            topMargin: units.gu(2)
+            topMargin: header.height + units.gu(2)
             left: parent.left
             right: parent.right
             bottom: composeBar.top
@@ -756,156 +972,6 @@
         addressableFields: messages.account ? messages.account.addressableVCardFields : ["tel"] // just to have a fallback there
     }
 
-    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
@@ -958,7 +1024,7 @@
     Item {
         id: screenTop
         anchors {
-            top: parent.top
+            top: pageHeader.bottom
             left: parent.left
             right: parent.right
         }
@@ -1115,4 +1181,6 @@
             }
         }
     }
+
+    // FIXME: we need a bottom edge here somehow
 }

=== modified file 'src/qml/MessagesHeader.qml'
--- src/qml/MessagesHeader.qml	2016-01-28 15:00:52 +0000
+++ src/qml/MessagesHeader.qml	2016-01-28 15:00:52 +0000
@@ -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
         }

=== added file 'src/qml/MessagingBottomEdge.qml'
--- src/qml/MessagingBottomEdge.qml	1970-01-01 00:00:00 +0000
+++ src/qml/MessagingBottomEdge.qml	2016-01-28 15:00:52 +0000
@@ -0,0 +1,43 @@
+import QtQuick 2.0
+import Ubuntu.Components 1.3
+
+BottomEdge {
+    id: bottomEdge
+
+    function commitWithProperties(properties) {
+        _realPage = messagesComponent.createObject(null, properties)
+        commit()
+    }
+
+    property var _realPage: null
+
+    height: parent ? parent.height : 0
+    hint.text: i18n.tr("+")
+    contentComponent: Item {
+        id: pageContent
+        implicitWidth: bottomEdge.width
+        implicitHeight: bottomEdge.height
+        children: bottomEdge._realPage
+    }
+
+    Component.onCompleted: {
+        mainView.bottomEdge = bottomEdge
+        _realPage = messagesComponent.createObject(null)
+    }
+
+    onCollapseCompleted: {
+        _realPage = messagesComponent.createObject(null)
+    }
+
+    Component {
+        id: messagesComponent
+
+        Messages {
+            anchors.fill: parent
+            onCancel: bottomEdge.collapse()
+            basePage: bottomEdge.parent
+            startedFromBottomEdge: true
+        }
+    }
+
+}

=== modified file 'src/qml/MessagingContactEditorPage.qml'
--- src/qml/MessagingContactEditorPage.qml	2016-01-06 18:29:47 +0000
+++ src/qml/MessagingContactEditorPage.qml	2016-01-28 15:00:52 +0000
@@ -52,8 +52,12 @@
 
     onContactSaved: {
         if (root.contactListPage) {
-            root.contactListPage.moveListToContact(contact)
-            root.contactListPage.phoneToAdd = ""
+            if (root.contactListPage.phoneToAdd !== "") {
+                mainStack.removePages(root.contactListPage)
+            } else {
+                root.contactListPage.moveListToContact(contact)
+                root.contactListPage.phoneToAdd = ""
+            }
         }
     }
 }

=== modified file 'src/qml/MessagingContactViewPage.qml'
--- src/qml/MessagingContactViewPage.qml	2016-01-06 18:29:47 +0000
+++ src/qml/MessagingContactViewPage.qml	2016-01-28 15:00:52 +0000
@@ -42,12 +42,13 @@
         var newDetail = Qt.createQmlObject(detailSourceTemplate, contact)
         if (newDetail) {
             contact.addDetail(newDetail)
-            pageStack.push(root.contactEditorPageURL,
-                           { model: root.model,
-                             contact: contact,
-                             initialFocusSection: "phones",
-                             newDetails: [newDetail],
-                             contactListPage: root.contactListPage })
+            mainStack.addPageToCurrentColumn(root,
+                                             root.contactEditorPageURL,
+                                             { model: root.model,
+                                               contact: contact,
+                                               initialFocusSection: "phones",
+                                               newDetails: [newDetail],
+                                               contactListPage: root.contactListPage })
             root.addPhoneToContact = ""
         } else {
             console.warn("Fail to create phone number detail")

=== modified file 'src/qml/MultiRecipientInput.qml'
--- src/qml/MultiRecipientInput.qml	2015-09-14 13:51:27 +0000
+++ src/qml/MultiRecipientInput.qml	2016-01-28 15:00:52 +0000
@@ -29,7 +29,7 @@
     property variant recipients: []
     property string searchString: ""
     signal clearSearch()
-    style: Theme.createStyleComponent("TextFieldStyle.qml", multiRecipientWidget)
+    styleName: "TextFieldStyle"
     clip: true
     height: contactFlow.height
     focus: activeFocus

=== modified file 'src/qml/NewRecipientPage.qml'
--- src/qml/NewRecipientPage.qml	2015-11-16 22:16:06 +0000
+++ src/qml/NewRecipientPage.qml	2016-01-28 15:00:52 +0000
@@ -44,11 +44,29 @@
     {
         multiRecipient.addRecipient(phoneNumber)
         multiRecipient.forceActiveFocus()
-        mainStack.pop()
-    }
-
-    title: i18n.tr("Add recipient")
-
+        mainStack.removePages(newRecipientPage)
+    }
+
+    header: PageHeader {
+        id: pageHeader
+
+        property alias leadingActions: leadingBar.actions
+        property alias trailingActions: trailingBar.actions
+
+        title: i18n.tr("Add recipient")
+        leadingActionBar {
+            id: leadingBar
+        }
+
+        trailingActionBar {
+            id: trailingBar
+        }
+    }
+
+    Sections {
+        id: headerSections
+        model: [i18n.tr("All"), i18n.tr("Favorites")]
+    }
     TextField {
         id: searchField
 
@@ -69,11 +87,10 @@
 
     state: "default"
     states: [
-        PageHeadState {
+        State {
             id: defaultState
-
             name: "default"
-            actions: [
+            property list<QtObject> trailingActions: [
                 Action {
                     text: i18n.tr("Search")
                     iconName: "search"
@@ -84,10 +101,11 @@
                     }
                 }
             ]
+
             PropertyChanges {
-                target: newRecipientPage.head
-                actions: defaultState.actions
-                sections.model: [i18n.tr("All"), i18n.tr("Favorites")]
+                target: pageHeader
+                trailingActions: defaultState.trailingActions
+                extension: headerSections
             }
             PropertyChanges {
                 target: searchField
@@ -95,27 +113,34 @@
                 visible: false
             }
         },
-        PageHeadState {
+        State {
             id: searchingState
-
             name: "searching"
-            backAction: Action {
-                iconName: "back"
-                text: i18n.tr("Cancel")
-                onTriggered: {
-                    newRecipientPage.forceActiveFocus()
-                    newRecipientPage.state = "default"
-                    newRecipientPage.head.sections.selectedIndex = 0
+            property list<QtObject> leadingActions: [
+                Action {
+                    iconName: "back"
+                    text: i18n.tr("Cancel")
+                    onTriggered: {
+                        newRecipientPage.forceActiveFocus()
+                        newRecipientPage.state = "default"
+                        headerSections.selectedIndex = 0
+                    }
                 }
-            }
+            ]
 
             PropertyChanges {
-                target: newRecipientPage.head
-                backAction: searchingState.backAction
+                target: pageHeader
+                leadingActions: searchingState.leadingActions
+                trailingActions: []
                 contents: searchField
             }
 
             PropertyChanges {
+                target: headerSections
+                visible: false
+            }
+
+            PropertyChanges {
                 target: searchField
                 text: ""
                 visible: true
@@ -139,12 +164,14 @@
         filterTerm: searchField.text
         onContactClicked: {
             if (newRecipientPage.phoneToAdd != "") {
-                mainView.addPhoneToContact(contact,
+                mainView.addPhoneToContact(newRecipientPage,
+                                           contact,
                                            newRecipientPage.phoneToAdd,
                                            newRecipientPage,
                                            contactList.listModel)
             } else {
-                mainView.showContactDetails(contact,
+                mainView.showContactDetails(newRecipientPage,
+                                            contact,
                                             newRecipientPage,
                                             contactList.listModel)
             }
@@ -152,24 +179,20 @@
 
         onAddNewContactClicked: {
             var newContact = ContactsJS.createEmptyContact(newRecipientPage.phoneToAdd, newRecipientPage)
-            pageStack.push(Qt.resolvedUrl("MessagingContactEditorPage.qml"),
-                           { model: contactList.listModel,
-                             contact: newContact,
-                             initialFocusSection: (newRecipientPage.phoneToAdd != "" ? "phones" : "name"),
-                             contactListPage: newRecipientPage
-                           })
+            mainStack.addPageToCurrentColumn(newRecipientPage,
+                                             Qt.resolvedUrl("MessagingContactEditorPage.qml"),
+                                             { model: contactList.listModel,
+                                               contact: newContact,
+                                               initialFocusSection: (newRecipientPage.phoneToAdd != "" ? "phones" : "name"),
+                                               contactListPage: newRecipientPage })
         }
     }
 
-    // WORKAROUND: This is necessary to make the header visible from a bottom edge page
     Component.onCompleted: {
-        parentPage.active = false
         if (QTCONTACTS_PRELOAD_VCARD !== "") {
             contactList.listModel.importContacts("file://" + QTCONTACTS_PRELOAD_VCARD)
         }
     }
-    Component.onDestruction: parentPage.active = true
-
     onActiveChanged: {
         if (active && (state === "searching")) {
             searchField.forceActiveFocus()

=== modified file 'src/qml/messaging-app.qml'
--- src/qml/messaging-app.qml	2016-01-28 15:00:52 +0000
+++ src/qml/messaging-app.qml	2016-01-28 15:00:52 +0000
@@ -39,6 +39,10 @@
     }
     property QtObject account: defaultPhoneAccount()
     property bool applicationActive: Qt.application.active
+    property alias mainStack: layout
+    property bool dualPanel: mainStack.columns > 1
+    property QtObject bottomEdge: null
+    property bool composingNewMessage: bottomEdge.status === BottomEdge.Committed
 
     activeFocusOnPress: false
 
@@ -58,7 +62,7 @@
         return null
     }
 
-    function showContactDetails(contact, contactListPage, contactsModel) {
+    function showContactDetails(currentPage, contact, contactListPage, contactsModel) {
         var initialProperties =  { "contactListPage": contactListPage,
                                    "model": contactsModel}
 
@@ -68,21 +72,24 @@
             initialProperties['contact'] = contact
         }
 
-        mainStack.push(Qt.resolvedUrl("MessagingContactViewPage.qml"),
-                       initialProperties)
-    }
-
-    function addNewContact(phoneNumber, contactListPage) {
-        mainStack.push(Qt.resolvedUrl("MessagingContactEditorPage.qml"),
-                       { "contactId": contactId,
-                         "addPhoneToContact": phoneNumber,
-                         "contactListPage": contactListPage })
-    }
-
-    function addPhoneToContact(contact, phoneNumber, contactListPage, contactsModel) {
+        mainStack.addPageToCurrentColumn(currentPage,
+                                         Qt.resolvedUrl("MessagingContactViewPage.qml"),
+                                         initialProperties)
+    }
+
+    function addNewContact(currentPage, phoneNumber, contactListPage) {
+        mainStack.addPageToCurrentColumn(currentPage,
+                                         Qt.resolvedUrl("MessagingContactEditorPage.qml"),
+                                         { "contactId": contactId,
+                                           "addPhoneToContact": phoneNumber,
+                                           "contactListPage": contactListPage })
+    }
+
+    function addPhoneToContact(currentPage, contact, phoneNumber, contactListPage, contactsModel) {
         if (contact === "") {
-            mainStack.push(Qt.resolvedUrl("NewRecipientPage.qml"),
-                           { "phoneToAdd": phoneNumber })
+            mainStack.addPageToCurrentColumn(currentPage,
+                                             Qt.resolvedUrl("NewRecipientPage.qml"),
+                                             { "phoneToAdd": phoneNumber })
         } else {
             var initialProperties = { "addPhoneToContact": phoneNumber,
                                       "contactListPage": contactListPage,
@@ -92,8 +99,9 @@
             } else {
                 initialProperties['contact'] = contact
             }
-            mainStack.push(Qt.resolvedUrl("MessagingContactViewPage.qml"),
-                           initialProperties)
+            mainStack.addPageToCurrentColumn(currentPage,
+                                             Qt.resolvedUrl("MessagingContactViewPage.qml"),
+                                             initialProperties)
         }
     }
 
@@ -119,6 +127,10 @@
         threadModel.removeThreads(threads);
     }
 
+    function showBottomEdgePage(properties) {
+        bottomEdge.commitWithProperties(properties)
+    }
+
     Connections {
         target: telepathyHelper
         // restore default bindings if any system settings changed
@@ -141,13 +153,14 @@
     Component.onCompleted: {
         i18n.domain = "messaging-app"
         i18n.bindtextdomain("messaging-app", i18nDirectory)
+        emptyStack()
     }
 
     Connections {
         target: telepathyHelper
         onSetupReady: {
             if (multiplePhoneAccounts && !telepathyHelper.defaultMessagingAccount &&
-                !settings.mainViewIgnoreFirstTimeDialog && mainStack.depth === 1) {
+                !settings.mainViewIgnoreFirstTimeDialog && mainPage.displayedThreadIndex < 0) {
                 PopupUtils.open(Qt.createComponent("Dialogs/NoDefaultSIMCardDialog.qml").createObject(mainView))
             }
         }
@@ -187,7 +200,7 @@
             var properties = {}
             emptyStack()
             properties["sharedAttachmentsTransfer"] = transfer
-            mainStack.currentPage.showBottomEdgePage(Qt.resolvedUrl("Messages.qml"), properties)
+            mainView.showBottomEdgePage(properties)
         }
     }
 
@@ -211,15 +224,20 @@
     }
 
     function emptyStack() {
-        while (mainStack.depth !== 1 && mainStack.depth !== 0) {
-            mainStack.pop()
+        mainStack.removePages(mainPage)
+        showEmptyState()
+    }
+
+    function showEmptyState() {
+        if (mainStack.columns > 1) {
+            layout.addPageToNextColumn(mainStack.primaryPage, emptyStatePageComponent.createObject(null))
         }
     }
 
     function startNewMessage() {
         var properties = {}
         emptyStack()
-        mainStack.currentPage.showBottomEdgePage(Qt.resolvedUrl("Messages.qml"))
+        mainView.showBottomEdgePage(properties)
     }
 
     function startChat(identifiers, text, accountId) {
@@ -261,9 +279,24 @@
         if (typeof(accountId)!=='undefined') {
             properties["accountId"] = accountId
         }
+
         emptyStack()
-        mainStack.push(Qt.resolvedUrl("Messages.qml"), properties)
-    }
+        mainStack.addPageToNextColumn(mainPage, messagesWithBottomEdge, properties)
+    }
+
+    InputInfo {
+        id: inputInfo
+    }
+
+    // WORKAROUND: Due the missing feature on SDK, they can not detect if
+    // there is a mouse attached to device or not. And this will cause the
+    // bootom edge component to not work correct on desktop.
+    Binding {
+        target:  QuickUtils
+        property: "mouseAttached"
+        value: inputInfo.hasMouse
+    }
+
 
     Connections {
         target: UriHandler
@@ -274,11 +307,57 @@
        }
     }
 
-
-    PageStack {
-        id: mainStack
-
-        objectName: "mainStack"
-        Component.onCompleted: mainStack.push(Qt.resolvedUrl("MainPage.qml"))
+    Component {
+        id: messagesWithBottomEdge
+
+        Messages {
+            id: messages
+            Loader {
+                id: messagesBottomEdgeLoader
+                active: mainView.dualPanel
+                sourceComponent: MessagingBottomEdge {
+                    id: messagesBottomEdge
+                    parent: messages
+                    hint.text: ""
+                    hint.height: 0
+                }
+            }
+        }
+    }
+
+    Component {
+        id: emptyStatePageComponent
+        Page {
+            id: emptyStatePage
+
+            EmptyState {
+                labelVisible: mainPage.isEmpty
+            }
+
+            header: PageHeader { }
+
+            Loader {
+                id: bottomEdgeLoader
+                sourceComponent: MessagingBottomEdge {
+                    parent: emptyStatePage
+                }
+            }
+        }
+    }
+
+    AdaptivePageLayout {
+        id: layout
+        anchors.fill: parent
+        primaryPage: MainPage {
+            id: mainPage
+        }
+
+        onColumnsChanged: {
+            // we only have things to do here in case no thread is selected
+            if (mainPage.displayedThreadIndex < 0) {
+                layout.removePages(mainPage)
+                showEmptyState()
+            }
+        }
     }
 }

=== modified file 'tests/autopilot/messaging_app/emulators.py'
--- tests/autopilot/messaging_app/emulators.py	2015-11-04 19:57:45 +0000
+++ tests/autopilot/messaging_app/emulators.py	2016-01-28 15:00:52 +0000
@@ -78,14 +78,14 @@
 
     def click_header_action(self, action):
         """Click the action 'action' on the header"""
-        self.get_header().click_action_button(action)
+        action = self.wait_select_single(objectName='%s_button' % action)
+        self.pointing_device.click_object(action)
 
     # messages page
     def get_messages_page(self):
         """Return messages with objectName messagesPage"""
 
-        return self.wait_select_single("Messages", objectName="messagesPage",
-                                       active=True)
+        return self.wait_select_single("Messages", objectName="messagesPage")
 
     def get_newmessage_textfield(self):
         """Return TextField with objectName newPhoneNumberField"""
@@ -116,40 +116,12 @@
 
         return self.get_messages_page().select_single(objectName='sendButton')
 
-    def get_toolbar_back_button(self):
-        """Return toolbar button with objectName back_toolbar_button"""
-
-        return self.select_single(
-            objectName='back_toolbar_button'
-        )
-
-    def get_toolbar_select_messages_button(self):
-        """Return toolbar button with objectName selectMessagesButton"""
-
-        return self.select_single(
-            objectName='selectMessagesButton'
-        )
-
     def get_contact_list_view(self):
         """Returns the ContactListView object"""
         return self.select_single(
             objectName='newRecipientList'
         )
 
-    def get_toolbar_contact_profile_button(self):
-        """Return toolbar button with objectName contactProfileButton"""
-
-        return self.select_single(
-            objectName='contactProfileButton'
-        )
-
-    def get_toolbar_contact_call_button(self):
-        """Return toolbar button with objectName contactCallButton"""
-
-        return self.select_single(
-            objectName='contactCallButton'
-        )
-
     def get_dialog_buttons(self, visible=True):
         """Return DialogButtons
 
@@ -213,7 +185,7 @@
 
     def start_new_message(self):
         """Reveal the bottom edge page to start composing a new message"""
-        self.get_main_page().reveal_bottom_edge_page()
+        self.reveal_bottom_edge_page()
 
     def enable_messages_selection_mode(self):
         """Enable the selection mode on the messages page by pressing and
@@ -338,38 +310,30 @@
 
     def open_settings_page(self):
         self.click_threads_header_settings()
-        return self.wait_select_single(SettingsPage)
+        settings_page = self.wait_select_single(SettingsPage)
+        settings_page.active.waitFor(True)
+        return settings_page
 
     def get_swipe_item_demo(self):
         return self.wait_select_single(
             'SwipeItemDemo', objectName='swipeItemDemo', parentActive=True)
 
-
-class PageWithBottomEdge(MainView):
-    """An emulator class that makes it easy to interact with the bottom edge
-       swipe page"""
-    def __init__(self, *args):
-        super(PageWithBottomEdge, self).__init__(*args)
-
     def reveal_bottom_edge_page(self):
         """Bring the bottom edge page to the screen"""
-        self.bottomEdgePageLoaded.wait_for(True)
         try:
-            action_item = self.wait_select_single(objectName='bottomEdgeTip')
-            start_x = (action_item.globalRect.x +
-                       (action_item.globalRect.width * 0.5))
-            start_y = (action_item.globalRect.y +
-                       (action_item.height * 0.5))
+            start_x = (self.globalRect.x +
+                       (self.globalRect.width * 0.5))
+            start_y = (self.globalRect.y + self.height)
             stop_y = start_y - (self.height * 0.7)
             self.pointing_device.drag(start_x, start_y,
                                       start_x, stop_y, rate=2)
-            self.isReady.wait_for(True)
+            self.composingNewMessage.wait_for(True)
         except StateNotFoundError:
             logger.error('BottomEdge element not found.')
             raise
 
 
-class MainPage(PageWithBottomEdge):
+class MainPage(MainView):
     """Autopilot helper for the Main Page."""
 
     def get_thread_count(self):

=== modified file 'tests/qml/CMakeLists.txt'
--- tests/qml/CMakeLists.txt	2016-01-28 15:00:52 +0000
+++ tests/qml/CMakeLists.txt	2016-01-28 15:00:52 +0000
@@ -36,7 +36,8 @@
 
 add_test(${TEST} ${XVFB_COMMAND} ${CMAKE_CURRENT_BINARY_DIR}/${TEST}
          -input ${CMAKE_CURRENT_SOURCE_DIR}
-         -import ${CMAKE_BINARY_DIR}/src)
+         -import ${CMAKE_BINARY_DIR}/src
+         -import ${UNITY8_QML_PATH})
 
 # make qml files visible in QtCreator
 file(GLOB_RECURSE NON_COMPILED_FILES *.qml)

=== modified file 'tests/qml/tst_MessagesView.qml'
--- tests/qml/tst_MessagesView.qml	2015-11-19 00:34:45 +0000
+++ tests/qml/tst_MessagesView.qml	2016-01-28 15:00:52 +0000
@@ -129,16 +129,21 @@
             var senderId = "1234567"
             var stack = findChild(mainViewLoader, "mainStack")
             tryCompare(mainViewLoader.item, 'applicationActive', true)
-            tryCompare(stack, 'depth', 1)
             // if messaging-app has no account set, it will not try to get the thread from history
             // and instead will generate the list of participants, take advantage of that
             var account = mainViewLoader.item.account
             mainViewLoader.item.account = null
             mainViewLoader.item.startChat(senderId, "")
             mainViewLoader.item.account = account
-            tryCompare(stack, 'depth', 2)
-            mainViewLoader.item.applicationActive = false
-            var messageList = findChild(mainViewLoader, "messageList")
+            var messageList
+            while (true) {
+                messageList = findChild(mainViewLoader, "messageList")
+                if (messageList) {
+                    break
+                }
+                wait(200)
+            }
+
             messageList.listModel = messagesModel
             tryCompare(messageList, 'count', 2)
             compare(messageAcknowledgeSpy.count, 0)