diff options
| author | Christian Mollekopf <chrigi_1@fastmail.fm> | 2016-01-21 11:36:43 +0100 |
|---|---|---|
| committer | Christian Mollekopf <chrigi_1@fastmail.fm> | 2016-01-21 11:36:43 +0100 |
| commit | bf96cfa0d75d256e036c76ec64f0f456014f2739 (patch) | |
| tree | 3ab0ff603dfccb9f28040af3a1559b01af09aa3f /applications/kube-mail/package/contents/ui/SingleMailView.qml | |
| parent | e4e11ba46f4ccce5f9ca63ab758a132d945061e8 (diff) | |
| parent | 9a3059769a0bf9dbf81e523c9245d2aa98420bb5 (diff) | |
| download | kube-bf96cfa0d75d256e036c76ec64f0f456014f2739.tar.gz kube-bf96cfa0d75d256e036c76ec64f0f456014f2739.zip | |
Merge remote-tracking branch 'origin/dev/libotp' into develop
Conflicts:
framework/mail/CMakeLists.txt
Diffstat (limited to 'applications/kube-mail/package/contents/ui/SingleMailView.qml')
| -rw-r--r-- | applications/kube-mail/package/contents/ui/SingleMailView.qml | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/applications/kube-mail/package/contents/ui/SingleMailView.qml b/applications/kube-mail/package/contents/ui/SingleMailView.qml index caec88dd..b6163798 100644 --- a/applications/kube-mail/package/contents/ui/SingleMailView.qml +++ b/applications/kube-mail/package/contents/ui/SingleMailView.qml | |||
| @@ -60,8 +60,11 @@ Item { | |||
| 60 | text: model.subject | 60 | text: model.subject |
| 61 | } | 61 | } |
| 62 | 62 | ||
| 63 | Label { | 63 | /*Label { |
| 64 | text: model.mimeMessage | 64 | text: model.mimeMessage |
| 65 | }*/ | ||
| 66 | Label { | ||
| 67 | text: model.renderedMessage | ||
| 65 | } | 68 | } |
| 66 | } | 69 | } |
| 67 | } | 70 | } |