diff --git a/ifttt/ifttt.php b/ifttt/ifttt.php
index b0e5e122..3203fec4 100644
--- a/ifttt/ifttt.php
+++ b/ifttt/ifttt.php
@@ -46,7 +46,7 @@ function ifttt_settings(&$a,&$s) {
         $s .= '</span>';
 
         $s .= '<div id="ifttt-configuration-wrapper">';
-	$s .= '<p>'.t("Create an account at <a href='http://www.ifttt.com'>IFTTT</a>. Create three Facebook recipes that are connected with <a href='https://ifttt.com/maker'>Maker</a> (In the form 'if Facebook then Maker') with the following parameters:").'</p>';
+	$s .= '<p>'.t("Create an account at <a href='http://www.ifttt.com'>IFTTT</a>. Create three Facebook recipes that are connected with 'Maker' with the following parameters:").'</p>';
 	$s .= '<h4>URL</h4>';
 	$s .= '<p>'.$a->get_baseurl()."/ifttt/".'</p>';
 	$s .= '<h4>Method</h4>';
diff --git a/mailstream/templates/settings.tpl b/mailstream/templates/settings.tpl
index bd24e38f..8729b7b5 100644
--- a/mailstream/templates/settings.tpl
+++ b/mailstream/templates/settings.tpl
@@ -1,10 +1,10 @@
-<span id="settings_mailstream_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose('settings_mailstream_expanded'); openClose('settings_mailstream_inflated');">
-<h3>{{$title}}</h3>
-</span>
-<div id="settings_mailstream_expanded" class="settings-block" style="display: none;">
-<span class="fakelink" onclick="openClose('settings_mailstream_expanded'); openClose('settings_mailstream_inflated');">
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<div class="settings-block">
   <h3>{{$title}}</h3>
-  </span>
 {{include file="field_input.tpl" field=$address}}
 {{include file="field_checkbox.tpl" field=$enabled}}
   <input type="submit" value="{{$submit}}">
diff --git a/pumpio/oauth/oauth_client.php b/pumpio/oauth/oauth_client.php
index 2a709aab..0e5fa4a5 100644
--- a/pumpio/oauth/oauth_client.php
+++ b/pumpio/oauth/oauth_client.php
@@ -998,6 +998,8 @@ class oauth_client_class
 		$this->response_status = 0;
 		$http = new http_class;
 		$http->debug = ($this->debug && $this->debug_http);
+		$http->timeout = 30;
+		$http->data_timeout = 60;
 		$http->log_debug = true;
 		$http->sasl_authenticate = 0;
 		$http->user_agent = $this->oauth_user_agent;
diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php
index 491b3ffe..74702414 100644
--- a/pumpio/pumpio.php
+++ b/pumpio/pumpio.php
@@ -499,7 +499,10 @@ function pumpio_send(&$a,&$b) {
 		$username = $user.'@'.$host;
 		$url = 'https://'.$host.'/api/user/'.$user.'/feed';
 
-		$success = $client->CallAPI($url, 'POST', $params, array('FailOnAccessError'=>true, 'RequestContentType'=>'application/json'), $user);
+		if (pumpio_reachable($url))
+			$success = $client->CallAPI($url, 'POST', $params, array('FailOnAccessError'=>true, 'RequestContentType'=>'application/json'), $user);
+		else
+			$success = false;
 
 		if($success) {
 
@@ -585,7 +588,10 @@ function pumpio_action(&$a, $uid, $uri, $action, $content = "") {
 
 	$url = 'https://'.$hostname.'/api/user/'.$username.'/feed';
 
-	$success = $client->CallAPI($url, 'POST', $params, array('FailOnAccessError'=>true, 'RequestContentType'=>'application/json'), $user);
+	if (pumpio_reachable($url))
+		$success = $client->CallAPI($url, 'POST', $params, array('FailOnAccessError'=>true, 'RequestContentType'=>'application/json'), $user);
+	else
+		$success = false;
 
 	if($success)
 		logger('pumpio_action '.$username.' '.$action.': success '.$uri);
@@ -713,7 +719,10 @@ function pumpio_fetchtimeline(&$a, $uid) {
 
 	$username = $user.'@'.$host;
 
-	$success = $client->CallAPI($url, 'GET', array(), array('FailOnAccessError'=>true), $user);
+	if (pumpio_reachable($url))
+		$success = $client->CallAPI($url, 'GET', array(), array('FailOnAccessError'=>true), $user);
+	else
+		$success = false;
 
 	if (!$success) {
 		logger('pumpio: error fetching posts for user '.$uid." ".$username." ".print_r($user, true));
@@ -1371,7 +1380,10 @@ function pumpio_fetchinbox(&$a, $uid) {
 	if ($last_id != "")
 		$url .= '?since='.urlencode($last_id);
 
-	$success = $client->CallAPI($url, 'GET', array(), array('FailOnAccessError'=>true), $user);
+	if (pumpio_reachable($url))
+		$success = $client->CallAPI($url, 'GET', array(), array('FailOnAccessError'=>true), $user);
+	else
+		$success = false;
 
 	if ($user->items) {
 	    $posts = array_reverse($user->items);
@@ -1409,12 +1421,18 @@ function pumpio_getallusers(&$a, $uid) {
 
 	$url = 'https://'.$hostname.'/api/user/'.$username.'/following';
 
-	$success = $client->CallAPI($url, 'GET', array(), array('FailOnAccessError'=>true), $users);
+	if (pumpio_reachable($url))
+		$success = $client->CallAPI($url, 'GET', array(), array('FailOnAccessError'=>true), $users);
+	else
+		$success = false;
 
 	if ($users->totalItems > count($users->items)) {
 		$url = 'https://'.$hostname.'/api/user/'.$username.'/following?count='.$users->totalItems;
 
-		$success = $client->CallAPI($url, 'GET', array(), array('FailOnAccessError'=>true), $users);
+		if (pumpio_reachable($url))
+			$success = $client->CallAPI($url, 'GET', array(), array('FailOnAccessError'=>true), $users);
+		else
+			$success = false;
 	}
 
 	foreach ($users->items AS $user)
@@ -1475,7 +1493,10 @@ function pumpio_queue_hook(&$a,&$b) {
 			$client->client_id = $consumer_key;
 			$client->client_secret = $consumer_secret;
 
-			$success = $client->CallAPI($z['url'], 'POST', $z['post'], array('FailOnAccessError'=>true, 'RequestContentType'=>'application/json'), $user);
+			if (pumpio_reachable($z['url']))
+				$success = $client->CallAPI($z['url'], 'POST', $z['post'], array('FailOnAccessError'=>true, 'RequestContentType'=>'application/json'), $user);
+			else
+				$success = false;
 
 			if($success) {
 				$post_id = $user->object->id;
@@ -1623,7 +1644,10 @@ function pumpio_fetchallcomments(&$a, $uid, $id) {
 
 	logger("pumpio_fetchallcomments: fetching comment for user ".$uid." url ".$url);
 
-	$success = $client->CallAPI($url, 'GET', array(), array('FailOnAccessError'=>true), $item);
+	if (pumpio_reachable($url))
+		$success = $client->CallAPI($url, 'GET', array(), array('FailOnAccessError'=>true), $item);
+	else
+		$success = false;
 
 	if (!$success)
 		return;
@@ -1688,6 +1712,12 @@ function pumpio_fetchallcomments(&$a, $uid, $id) {
 	}
 }
 
+
+function pumpio_reachable($url) {
+	$data = z_fetch_url($url, false, $redirects, array('timeout'=>10));
+	return(intval($data['return_code']) != 0);
+}
+
 /*
 To-Do:
  - edit own notes