diff --git a/pvr.hts/resources/language/resource.language.en_gb/strings.po b/pvr.hts/resources/language/resource.language.en_gb/strings.po
index 4f1edf27..fce88309 100644
--- a/pvr.hts/resources/language/resource.language.en_gb/strings.po
+++ b/pvr.hts/resources/language/resource.language.en_gb/strings.po
@@ -150,3 +150,59 @@ msgctxt "#30361"
 msgid "Record max once per day"
 msgstr ""
 
+#empty strings from id 30362 to 30399
+
+#. Subscription states representation
+
+msgctxt "#30400"
+msgid "No free adapter available!"
+msgstr ""
+
+msgctxt "#30401"
+msgid "Livestream aborted, adapter stolen by other subscription!"
+msgstr ""
+
+msgctxt "#30402"
+msgid "Scrambled channel!"
+msgstr ""
+
+msgctxt "#30403"
+msgid "No signal!"
+msgstr ""
+
+msgctxt "#30404"
+msgid "Subscription error!"
+msgstr ""
+
+msgctxt "#30405"
+msgid "Failed to hijack an adapter!"
+msgstr ""
+
+msgctxt "#30406"
+msgid "User limit reached!"
+msgstr ""
+
+#. Subscription conflict dialog
+
+msgctxt "#30407"
+msgid "Do you want to increase the priority to hijack an adapter?"
+msgstr ""
+
+msgctxt "#30408"
+msgid "WARNING: this can abort an active recording or livestream!"
+msgstr ""
+
+msgctxt "#30409"
+msgid "Ignore"
+msgstr ""
+
+msgctxt "#30410"
+msgid "Increase priority"
+msgstr ""
+
+msgctxt "#30411"
+msgid "Subscription conflict!"
+msgstr ""
+
+
+
diff --git a/src/HTSPConnection.cpp b/src/HTSPConnection.cpp
index 0047a243..ea70e5c8 100644
--- a/src/HTSPConnection.cpp
+++ b/src/HTSPConnection.cpp
@@ -331,8 +331,14 @@ htsmsg_t *CHTSPConnection::SendAndWait0 ( const char *method, htsmsg_t *msg, int
   }
 
   /* Wait for response */
-  msg = resp.Get(m_mutex, iResponseTimeout);
+  msg = resp.Get(m_mutex, iResponseTimeout > 0 ? iResponseTimeout : 1);
   m_messages.erase(seq);
+
+  /* No response needed */
+  if (!iResponseTimeout && !msg)
+    return NULL;
+
+  /* No response received */
   if (!msg)
   {
     //XBMC->QueueNotification(QUEUE_ERROR, "Command %s failed: No response received", method);
diff --git a/src/HTSPDemuxer.cpp b/src/HTSPDemuxer.cpp
index a5ec887c..285abd4e 100644
--- a/src/HTSPDemuxer.cpp
+++ b/src/HTSPDemuxer.cpp
@@ -26,6 +26,7 @@
 #include "platform/threads/atomics.h"
 #include "platform/util/timeutils.h"
 #include "platform/sockets/tcp.h"
+#include <thread>
 
 extern "C" {
 #include "libhts/htsmsg_binary.h"
@@ -40,6 +41,26 @@ using namespace std;
 using namespace ADDON;
 using namespace PLATFORM;
 
+bool bDialogForceStart = false;
+
+void DialogLivestreamAborted( void )
+{
+  bDialogForceStart = false;
+  bDialogForceStart = GUI->Dialog_YesNo_ShowAndGetInput(
+      XBMC->GetLocalizedString(30411),XBMC->GetLocalizedString(30401),
+      XBMC->GetLocalizedString(30407),XBMC->GetLocalizedString(30408),
+      XBMC->GetLocalizedString(30409),XBMC->GetLocalizedString(30410));
+}
+
+void DialogLivestreamNostart( void )
+{
+  bDialogForceStart = false;
+  bDialogForceStart = GUI->Dialog_YesNo_ShowAndGetInput(
+      XBMC->GetLocalizedString(30411),XBMC->GetLocalizedString(30400),
+      XBMC->GetLocalizedString(30407),XBMC->GetLocalizedString(30408),
+      XBMC->GetLocalizedString(30409),XBMC->GetLocalizedString(30410));
+}
+
 CHTSPDemuxer::CHTSPDemuxer ( CHTSPConnection &conn )
   : m_conn(conn), m_pktBuffer((size_t)-1),
     m_seekTime(INVALID_SEEKTIME)
@@ -53,7 +74,7 @@ CHTSPDemuxer::~CHTSPDemuxer ( void )
 void CHTSPDemuxer::Connected ( void )
 {
   /* Re-subscribe */
-  if (m_subscription.active)
+  if (!m_subscription.state == SUBSCRIPTION_STOPPED)
   {
     tvhdebug("demux re-starting stream");
     SendSubscribe(true);
@@ -68,7 +89,7 @@ void CHTSPDemuxer::Connected ( void )
 void CHTSPDemuxer::Close0 ( void )
 {
   /* Send unsubscribe */
-  if (m_subscription.active)
+  if (!m_subscription.state == SUBSCRIPTION_STOPPED)
     SendUnsubscribe();
 
   /* Clear */
@@ -100,10 +121,10 @@ bool CHTSPDemuxer::Open ( const PVR_CHANNEL &chn )
   SendSubscribe();
   
   /* Send unsubscribe if subscribing failed */
-  if (!m_subscription.active)
+  if (m_subscription.state == SUBSCRIPTION_STOPPED)
     SendUnsubscribe();
   
-  return m_subscription.active;
+  return (!m_subscription.state == SUBSCRIPTION_STOPPED);
 }
 
 void CHTSPDemuxer::Close ( void )
@@ -147,7 +168,7 @@ bool CHTSPDemuxer::Seek
   htsmsg_t *m;
 
   CLockObject lock(m_conn.Mutex());
-  if (!m_subscription.active)
+  if (m_subscription.state == SUBSCRIPTION_STOPPED)
     return false;
 
   tvhdebug("demux seek %d", time);
@@ -185,7 +206,7 @@ bool CHTSPDemuxer::Seek
 void CHTSPDemuxer::Speed ( int speed )
 {
   CLockObject lock(m_conn.Mutex());
-  if (!m_subscription.active)
+  if (m_subscription.state == SUBSCRIPTION_STOPPED)
     return;
   m_subscription.speed = speed;
   SendSpeed();
@@ -254,7 +275,10 @@ void CHTSPDemuxer::SendSubscribe ( bool force )
 
   htsmsg_destroy(m);
 
-  m_subscription.active = true;
+  m_subscription.state  = SUBSCRIPTION_STARTING;
+  m_subscription.weight = 0;   // use the default weight
+  time(&m_subscription.start); // set start time
+
   tvhdebug("demux successfully subscribed to %d", m_subscription.channelId);
 }
 
@@ -267,7 +291,7 @@ void CHTSPDemuxer::SendUnsubscribe ( void )
   htsmsg_add_u32(m, "subscriptionId", m_subscription.subscriptionId);
 
   /* Mark subscription as inactive immediately in case this command fails */
-  m_subscription.active = false;
+  m_subscription.state = SUBSCRIPTION_STOPPED;
   
   /* Send and Wait */
   tvhdebug("demux unsubscribe from %d", m_subscription.channelId);
@@ -298,6 +322,30 @@ void CHTSPDemuxer::SendSpeed ( bool force )
     htsmsg_destroy(m);
 }
 
+void CHTSPDemuxer::SendWeight ( int weight )
+{
+  if (m_subscription.state == SUBSCRIPTION_STOPPED)
+    return;
+
+  htsmsg_t *m;
+
+  /* Save current weight */
+  m_subscription.weight = weight;
+
+  /* Build message */
+  m = htsmsg_create_map();
+  htsmsg_add_u32(m, "subscriptionId", m_subscription.subscriptionId);
+  htsmsg_add_u32(m, "weight",         m_subscription.weight);
+
+  tvhdebug("demux send weight %u", m_subscription.weight);
+
+  /* Send and Wait */
+  if ((m = m_conn.SendAndWait0("subscriptionChangeWeight", m,0)) == NULL)
+    return;
+
+  htsmsg_destroy(m);
+}
+
 /* **************************************************************************
  * Parse incoming data
  * *************************************************************************/
@@ -353,7 +401,7 @@ void CHTSPDemuxer::ParseMuxPacket ( htsmsg_t *m )
   int         iStreamId;
   
   /* Ignore packets while switching channels */
-  if (!m_subscription.active)
+  if (m_subscription.state == SUBSCRIPTION_STOPPED)
   {
     tvhdebug("Ignored mux packet due to channel switch");
     return;
@@ -586,15 +634,120 @@ void CHTSPDemuxer::ParseSubscriptionSpeed ( htsmsg_t *m )
 
 void CHTSPDemuxer::ParseSubscriptionStatus ( htsmsg_t *m )
 {
-  const char *status;
+  if (m_subscription.state == SUBSCRIPTION_STOPPED)
+    return;
+
+  const char *status, *error;
   status = htsmsg_get_str(m, "status");
+  error  = htsmsg_get_str(m, "subscriptionError");
 
-  // this field is absent when everything is fine
   if (status != NULL)
-  {
     tvhinfo("Bad subscription status: %s", status);
-    XBMC->QueueNotification(QUEUE_INFO, status);
+
+  /* 'subscriptionError' was added in htsp v20 */
+  /* Use 'status' for older tvheadend backends */
+  if (m_conn.GetProtocol() >= 20)
+  {
+    if (error != NULL)
+    {
+      if (!strcmp("badSignal", error))
+        m_subscription.state = SUBSCRIPTION_NOSIGNAL;
+      else if (!strcmp("scrambled", error))
+        m_subscription.state = SUBSCRIPTION_SCRAMBLED;
+      else if (!strcmp("userLimit", error))
+        m_subscription.state = SUBSCRIPTION_USERLIMIT;
+      else if (!strcmp("noFreeAdapter", error))
+      {
+        /* No free adapter, AKA subscription conflict */
+        SubscriptionConflict();
+      }
+      else
+        m_subscription.state = SUBSCRIPTION_UNKNOWN;
+
+      /* Show an OSD message */
+      ShowSubscriptionError();
+    }
+    else
+      m_subscription.state = SUBSCRIPTION_RUNNING;
+  }
+  else
+  {
+    // this field is absent when everything is fine
+    if (status != NULL)
+    {
+      XBMC->QueueNotification(QUEUE_INFO, status);
+      m_subscription.state = SUBSCRIPTION_UNKNOWN;
+    }
+    else
+      m_subscription.state = SUBSCRIPTION_RUNNING;
+  }
+}
+
+void CHTSPDemuxer::SubscriptionConflict ( void )
+{
+  if (m_subscription.state == SUBSCRIPTION_RUNNING)
+  {
+    /* Subscription was running before, but the adapter got stolen by another subscription */
+    /* Ask user if he wants to hijack an adapter back by increasing ist's weight           */
+    std::thread job(DialogLivestreamAborted);
+    job.detach();
+    m_subscription.state = SUBSCRIPTION_NOFREEADAPTER_ABORT;
   }
+  else if (m_subscription.state == SUBSCRIPTION_STARTING ||
+           m_subscription.state == SUBSCRIPTION_NOFREEADAPTER_NOSTART_WAITING)
+  {
+    time_t now;
+    time(&now);
+
+    /* No free adapter found to start this channel         */
+    /* Ask user if he wants to hijack an adapter after 15s */
+    if ((now-m_subscription.start) > 15)
+    {
+      std::thread job(DialogLivestreamNostart);
+      job.detach();
+      m_subscription.state = SUBSCRIPTION_NOFREEADAPTER_NOSTART;
+    }
+    else
+      m_subscription.state = SUBSCRIPTION_NOFREEADAPTER_NOSTART_WAITING;
+  }
+  else if (m_subscription.state == SUBSCRIPTION_NOFREEADAPTER_NOSTART ||
+           m_subscription.state == SUBSCRIPTION_NOFREEADAPTER_ABORT )
+  {
+    if (bDialogForceStart)
+    {
+      bDialogForceStart = false;
+      SendWeight(100);
+      m_subscription.state = SUBSCRIPTION_FORCERUNNING;
+    }
+  }
+  else if (m_subscription.state == SUBSCRIPTION_FORCERUNNING)
+  {
+    /* Increase weight in steps of 25 till we are running */
+    /* Limit weight to +600 (Highest priority in tvh)     */
+    if (m_subscription.weight <= 600)
+      SendWeight(m_subscription.weight + 25);
+    else
+      m_subscription.state = SUBSCRIPTION_FORCERUNNING_FAILED;
+  }
+}
+
+void CHTSPDemuxer::ShowSubscriptionError ( void )
+{
+  if (m_subscription.state == SUBSCRIPTION_NOFREEADAPTER_NOSTART ||
+      m_subscription.state == SUBSCRIPTION_NOFREEADAPTER_NOSTART_WAITING)
+    XBMC->QueueNotification(QUEUE_WARNING, XBMC->GetLocalizedString(30400));
+  else if (m_subscription.state == SUBSCRIPTION_NOFREEADAPTER_ABORT)
+    XBMC->QueueNotification(QUEUE_WARNING, XBMC->GetLocalizedString(30401));
+  else if (m_subscription.state == SUBSCRIPTION_SCRAMBLED)
+    XBMC->QueueNotification(QUEUE_WARNING, XBMC->GetLocalizedString(30402));
+  else if (m_subscription.state == SUBSCRIPTION_NOSIGNAL)
+    XBMC->QueueNotification(QUEUE_WARNING, XBMC->GetLocalizedString(30403));
+  else if (m_subscription.state == SUBSCRIPTION_UNKNOWN)
+    XBMC->QueueNotification(QUEUE_ERROR,   XBMC->GetLocalizedString(30404));
+  else if (m_subscription.state == SUBSCRIPTION_FORCERUNNING_FAILED)
+    XBMC->QueueNotification(QUEUE_WARNING, XBMC->GetLocalizedString(30405));
+  else if (m_subscription.state == SUBSCRIPTION_USERLIMIT)
+    XBMC->QueueNotification(QUEUE_WARNING, XBMC->GetLocalizedString(30406));
 }
 
 void CHTSPDemuxer::ParseQueueStatus ( htsmsg_t *_unused(m) )
diff --git a/src/HTSPTypes.h b/src/HTSPTypes.h
index fddd1149..c35843c9 100644
--- a/src/HTSPTypes.h
+++ b/src/HTSPTypes.h
@@ -63,6 +63,25 @@ enum eHTSPEventType
   HTSP_EVENT_REC_UPDATE = 4,
 };
 
+/**
+ * Possible (internal) subscription states
+ */
+enum eSubsriptionState
+{
+  SUBSCRIPTION_STOPPED                        = 0,  /* subscription is stopped or not started yet                                                                      */
+  SUBSCRIPTION_STARTING                       = 1,  /* subscription is starting                                                                                        */
+  SUBSCRIPTION_RUNNING                        = 2,  /* subscription is running normal                                                                                  */
+  SUBSCRIPTION_NOFREEADAPTER_ABORT            = 3,  /* subscription was aborted because our adapter got stolen (other subscriptions with higher weight)                */
+  SUBSCRIPTION_NOFREEADAPTER_NOSTART          = 4,  /* subscription could not be started because all our adapters are busy (other subscriptions with higher weight)    */
+  SUBSCRIPTION_NOFREEADAPTER_NOSTART_WAITING  = 5,  /* subscription could not be started because all our adapters are busy, waiting for user input                     */
+  SUBSCRIPTION_SCRAMBLED                      = 6,  /* subscription is not running because the channel is scrambled                                                    */
+  SUBSCRIPTION_NOSIGNAL                       = 7,  /* subscription is not running because of a weak/no input signal                                                   */
+  SUBSCRIPTION_USERLIMIT                      = 8,  /* userlimit is reached, so we could not start this subscription                                                   */
+  SUBSCRIPTION_UNKNOWN                        = 9,  /* subscription state is unknown                                                                                   */
+  SUBSCRIPTION_FORCERUNNING                   = 10, /* we want to force this subscription to a running state by increasing it's weight                                 */
+  SUBSCRIPTION_FORCERUNNING_FAILED            = 11  /* we increased our subscription weight to it's max, but the subscription is still not running                     */
+};
+
 namespace htsp
 {
 
@@ -309,7 +328,8 @@ struct SRecording
   {
     return state == PVR_TIMER_STATE_SCHEDULED ||
            state == PVR_TIMER_STATE_RECORDING ||
-           state == PVR_TIMER_STATE_DISABLED;
+           state == PVR_TIMER_STATE_DISABLED  ||
+           state == PVR_TIMER_STATE_CONFLICT_NOK;
   }
 };
 
@@ -479,15 +499,19 @@ typedef std::vector<SHTSPEvent> SHTSPEventList;
 
 struct SSubscription
 {
-  uint32_t subscriptionId;
-  uint32_t channelId;
-  int      speed;
-  bool     active;
+  uint32_t          subscriptionId;
+  uint32_t          channelId;
+  time_t            start;
+  int               speed;
+  eSubsriptionState state;
+  int      weight;
 
   SSubscription() :
     channelId(0),
+    start(0),
     speed (1000),
-    active(false)
+    state(SUBSCRIPTION_STOPPED),
+    weight(0)
   {
     static int previousId = 0;
     subscriptionId = ++previousId;
diff --git a/src/Tvheadend.cpp b/src/Tvheadend.cpp
index a8176209..910bf834 100644
--- a/src/Tvheadend.cpp
+++ b/src/Tvheadend.cpp
@@ -1871,6 +1871,15 @@ void CTvheadend::ParseRecordingAddOrUpdate ( htsmsg_t *msg, bool bAdd )
     }
   }
   
+  if ((str = htsmsg_get_str(msg, "subscriptionError")) != NULL)
+  {
+    if (!strcmp(str, "noFreeAdapter"))
+    {
+      /* No free adapter AKA subscription conflict */
+      UPDATE(rec.state, PVR_TIMER_STATE_CONFLICT_NOK);
+    }
+  }
+
   /* Update */
   if (update)
   {
diff --git a/src/Tvheadend.h b/src/Tvheadend.h
index 598a53ed..1ab01f0b 100644
--- a/src/Tvheadend.h
+++ b/src/Tvheadend.h
@@ -272,7 +272,11 @@ class CHTSPDemuxer
   void SendSubscribe   ( bool force = false );
   void SendUnsubscribe ( void );
   void SendSpeed       ( bool force = false );
+  void SendWeight      ( int );
   
+  void SubscriptionConflict  ( void );
+  void ShowSubscriptionError ( void );
+
   void ParseMuxPacket           ( htsmsg_t *m );
   void ParseSourceInfo          ( htsmsg_t *m );
   void ParseSubscriptionStart   ( htsmsg_t *m );
diff --git a/src/client.cpp b/src/client.cpp
index 9cb525d3..9fc337e8 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -21,7 +21,6 @@
 
 #include "client.h"
 #include "kodi/xbmc_pvr_dll.h"
-#include "kodi/libKODI_guilib.h"
 #include "platform/threads/mutex.h"
 #include "platform/threads/atomics.h"
 #include "platform/util/util.h"
@@ -59,11 +58,12 @@ bool       g_bAsyncEpg           = false;
 /*
  * Global state
  */
-CHelper_libXBMC_addon *XBMC      = NULL;
-CHelper_libXBMC_pvr   *PVR       = NULL;
-CHelper_libXBMC_codec *CODEC     = NULL;
-PVR_MENUHOOK          *menuHook  = NULL;
-CTvheadend            *tvh       = NULL;
+CHelper_libXBMC_addon    *XBMC      = NULL;
+CHelper_libXBMC_pvr      *PVR       = NULL;
+CHelper_libXBMC_codec    *CODEC     = NULL;
+CHelper_libKODI_guilib   *GUI       = NULL;
+PVR_MENUHOOK             *menuHook  = NULL;
+CTvheadend               *tvh       = NULL;
 
 /* **************************************************************************
  * ADDON setup
@@ -115,13 +115,15 @@ ADDON_STATUS ADDON_Create(void* hdl, void* _unused(props))
   XBMC  = new CHelper_libXBMC_addon;
   CODEC = new CHelper_libXBMC_codec;
   PVR   = new CHelper_libXBMC_pvr;
+  GUI   = new CHelper_libKODI_guilib;
   
-  if (!XBMC->RegisterMe(hdl) ||
+  if (!XBMC->RegisterMe(hdl)  || !GUI->RegisterMe(hdl) ||
       !CODEC->RegisterMe(hdl) || !PVR->RegisterMe(hdl))
   {
     SAFE_DELETE(PVR);
     SAFE_DELETE(CODEC);
     SAFE_DELETE(XBMC);
+    SAFE_DELETE(GUI);
     return ADDON_STATUS_PERMANENT_FAILURE;
   }
 
@@ -167,6 +169,7 @@ ADDON_STATUS ADDON_Create(void* hdl, void* _unused(props))
     SAFE_DELETE(PVR);
     SAFE_DELETE(CODEC);
     SAFE_DELETE(XBMC);
+    SAFE_DELETE(GUI);
 
     return ADDON_STATUS_LOST_CONNECTION;
   }
diff --git a/src/client.h b/src/client.h
index efd6276d..841fe422 100644
--- a/src/client.h
+++ b/src/client.h
@@ -25,10 +25,12 @@
 #include "kodi/libXBMC_addon.h"
 #include "kodi/libXBMC_pvr.h"
 #include "kodi/libXBMC_codec.h"
+#include "kodi/libKODI_guilib.h"
 
 extern ADDON::CHelper_libXBMC_addon*  XBMC;
 extern CHelper_libXBMC_pvr*           PVR;
 extern CHelper_libXBMC_codec*         CODEC;
+extern CHelper_libKODI_guilib*        GUI;
 
 #define DEFAULT_HOST             "127.0.0.1"
 #define DEFAULT_HTTP_PORT        9981